diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000..87d5ecb --- /dev/null +++ b/.github/workflows/gradle.yml @@ -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 diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index b268ef3..52304d0 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,6 +4,14 @@ diff --git a/app/build.gradle b/app/build.gradle index 1583448..b26df2c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d6aee4b..e869354 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -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 +======= + + +>>>>>>> Stashed changes + + +======= + android:name=".offlinePage" + android:exported="false" + android:theme="@style/Theme.Design.NoActionBar" /> + +>>>>>>> Stashed changes + + + + + + + + \ No newline at end of file diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..51fcb05 Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/com/example/aquaanalyzomatic/AutonPage.java b/app/src/main/java/com/example/aquaanalyzomatic/AutonPage.java new file mode 100644 index 0000000..746a8ca --- /dev/null +++ b/app/src/main/java/com/example/aquaanalyzomatic/AutonPage.java @@ -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; + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/aquaanalyzomatic/CreateUser.java b/app/src/main/java/com/example/aquaanalyzomatic/CreateUser.java index 90c84fb..d869a67 100644 --- a/app/src/main/java/com/example/aquaanalyzomatic/CreateUser.java +++ b/app/src/main/java/com/example/aquaanalyzomatic/CreateUser.java @@ -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; diff --git a/app/src/main/java/com/example/aquaanalyzomatic/TeleopPage.java b/app/src/main/java/com/example/aquaanalyzomatic/TeleopPage.java new file mode 100644 index 0000000..7cfd2f8 --- /dev/null +++ b/app/src/main/java/com/example/aquaanalyzomatic/TeleopPage.java @@ -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; + }); + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 2b068d1..a1c9844 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,30 +1,38 @@ - - - - - - - - - - \ No newline at end of file + android:viewportWidth="500" + android:viewportHeight="500"> + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_auton_page.xml b/app/src/main/res/layout/activity_auton_page.xml new file mode 100644 index 0000000..ed86452 --- /dev/null +++ b/app/src/main/res/layout/activity_auton_page.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + +