diff --git a/Generator/.idea/planningMode.xml b/Generator/.idea/planningMode.xml index c085dcb..e0804ea 100644 --- a/Generator/.idea/planningMode.xml +++ b/Generator/.idea/planningMode.xml @@ -6,6 +6,7 @@ + diff --git a/Generator/app/build.gradle.kts b/Generator/app/build.gradle.kts index 6b94ed0..fc54117 100644 --- a/Generator/app/build.gradle.kts +++ b/Generator/app/build.gradle.kts @@ -62,10 +62,6 @@ dependencies { implementation(libs.activity) implementation(libs.constraintlayout) - // FRC NetworkTables Dependencies (Kotlin DSL Syntax) - implementation(libs.ntcore.java) - implementation(libs.wpiutil.java) - // Google Sheets & Core API implementation("com.google.apis:google-api-services-sheets:v4-rev581-1.25.0") { exclude(group = "com.google.guava", module = "listenablefuture") diff --git a/Generator/app/src/main/ic_launcher-playstore.png b/Generator/app/src/main/ic_launcher-playstore.png index a7511ca..5a015c9 100644 Binary files a/Generator/app/src/main/ic_launcher-playstore.png and b/Generator/app/src/main/ic_launcher-playstore.png differ diff --git a/Generator/app/src/main/java/com/example/generator/ColorActivity.java b/Generator/app/src/main/java/com/example/generator/ColorActivity.java deleted file mode 100644 index 53f2356..0000000 --- a/Generator/app/src/main/java/com/example/generator/ColorActivity.java +++ /dev/null @@ -1,208 +0,0 @@ -package com.example.generator; - -import android.content.Intent; -import android.content.res.ColorStateList; -import android.os.Bundle; -import android.widget.AdapterView; -import android.widget.ArrayAdapter; -import android.widget.Button; -import android.widget.CheckBox; -import android.widget.RadioButton; -import android.widget.Spinner; - -import androidx.activity.EdgeToEdge; -import androidx.appcompat.app.AppCompatActivity; -import androidx.core.content.ContextCompat; -import androidx.core.graphics.Insets; -import androidx.core.view.ViewCompat; -import androidx.core.view.WindowInsetsCompat; - -import com.google.android.material.button.MaterialButton; - -public class ColorActivity extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - EdgeToEdge.enable(this); - setContentView(R.layout.activity_color); - 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; - }); - - Spinner spinnerP = (Spinner) findViewById(R.id.ColorSelector); - ArrayAdapter adapter = ArrayAdapter.createFromResource(this, R.array.colorOptions, android.R.layout.simple_spinner_item); - adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - spinnerP.setAdapter(adapter); - - Spinner spinnerS = (Spinner) findViewById(R.id.ColorSelector2nd); - ArrayAdapter adapter2 = ArrayAdapter.createFromResource(this, R.array.colorOptions2nd, android.R.layout.simple_spinner_item); - adapter2.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - spinnerS.setAdapter(adapter2); - - Button backButton = (Button) findViewById(R.id.button_back); - Button nextButton = (Button) findViewById(R.id.button_next); - backButton.setOnClickListener((v) -> { - Intent intent = new Intent(this, EventsActivity.class); - startActivity(intent); - }); - nextButton.setOnClickListener((v) -> { - Intent intent = new Intent(this, MakeStartingActivity.class); - startActivity(intent); - }); - - MaterialButton TeleExample1 = (MaterialButton) findViewById(R.id.button_tele_example); - MaterialButton TeleExample2 = (MaterialButton) findViewById(R.id.button_tele_example2); - MaterialButton AutoExample1 = (MaterialButton) findViewById(R.id.button_auto_example); - MaterialButton AutoExample2 = (MaterialButton) findViewById(R.id.button_auto_example2); - MaterialButton NavExample1 = (MaterialButton) findViewById(R.id.button_nav_example); - MaterialButton NavExample2 = (MaterialButton) findViewById(R.id.button_nav_example2); - RadioButton radioButton = (RadioButton) findViewById(R.id.radioButton); - CheckBox checkBox = (CheckBox) findViewById(R.id.checkBox); - - spinnerP.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { - @Override - public void onItemSelected(AdapterView parentView, android.view.View selectedItemView, int position, long id) { - String selectedItem = parentView.getItemAtPosition(position).toString(); - - int mainColorRes = 0; - int bgTintRes = 0; - String Color = ""; - - switch (selectedItem) { - case "Primary Orange": - Color = "Orange"; - mainColorRes = R.color.orangeMain; - bgTintRes = R.color.orangeMain_bg; - break; - case "Primary Green": - Color = "Green"; - mainColorRes = R.color.greenMain; - bgTintRes = R.color.greenMain_bg; - break; - case "Primary Blue": - Color = "Blue"; - mainColorRes = R.color.blueMain; - bgTintRes = R.color.blueMain_bg; - break; - case "Primary Pink": - Color = "Pink"; - mainColorRes = R.color.pinkMain; - bgTintRes = R.color.pinkMain_bg; - break; - case "Primary Purple": - Color = "Purple"; - mainColorRes = R.color.purpleMain; - bgTintRes = R.color.purpleMain_bg; - break; - case "Primary Red": - Color = "Red"; - mainColorRes = R.color.redMain; - bgTintRes = R.color.redMain_bg; - break; - case "Primary Yellow": - Color = "Yellow"; - mainColorRes = R.color.yellowMain; - bgTintRes = R.color.yellowMain_bg; - break; - } - - if (mainColorRes != 0) { - ColorStateList mainColorStateList = ContextCompat.getColorStateList(ColorActivity.this, mainColorRes); - ColorStateList bgTintStateList = ContextCompat.getColorStateList(ColorActivity.this, bgTintRes); - int mainColorInt = ContextCompat.getColor(ColorActivity.this, mainColorRes); - - EventsActivity.Data.setColorP(Color); - - spinnerP.setBackgroundColor(mainColorInt); - radioButton.setButtonTintList(mainColorStateList); - checkBox.setButtonTintList(mainColorStateList); - - TeleExample1.setStrokeColor(mainColorStateList); - TeleExample1.setBackgroundTintList(bgTintStateList); - - AutoExample2.setStrokeColor(mainColorStateList); - AutoExample2.setBackgroundTintList(bgTintStateList); - NavExample2.setBackgroundColor(mainColorInt); - NavExample1.setBackgroundColor(mainColorInt); - - backButton.setBackgroundColor(mainColorInt); - nextButton.setBackgroundColor(mainColorInt); - } - } - - @Override - public void onNothingSelected(AdapterView parentView) {} - }); - - spinnerS.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { - @Override - public void onItemSelected(AdapterView parentView, android.view.View selectedItemView, int position, long id) { - String selectedItem = parentView.getItemAtPosition(position).toString(); - - int mainColorRes = 0; - int bgTintRes = 0; - String Color = ""; - - switch (selectedItem) { - case "Secondary Orange": - Color = "Orange"; - mainColorRes = R.color.orangeMain; - bgTintRes = R.color.orangeMain_bg; - break; - case "Secondary Green": - Color = "Green"; - mainColorRes = R.color.greenMain; - bgTintRes = R.color.greenMain_bg; - break; - case "Secondary Blue": - Color = "Blue"; - mainColorRes = R.color.blueMain; - bgTintRes = R.color.blueMain_bg; - break; - case "Secondary Pink": - Color = "Pink"; - mainColorRes = R.color.pinkMain; - bgTintRes = R.color.pinkMain_bg; - break; - case "Secondary Purple": - Color = "Purple"; - mainColorRes = R.color.purpleMain; - bgTintRes = R.color.purpleMain_bg; - break; - case "Secondary Red": - Color = "Red"; - mainColorRes = R.color.redMain; - bgTintRes = R.color.redMain_bg; - break; - case "Secondary Yellow": - Color = "Yellow"; - mainColorRes = R.color.yellowMain; - bgTintRes = R.color.yellowMain_bg; - break; - } - - if (mainColorRes != 0) { - ColorStateList mainColorStateList = ContextCompat.getColorStateList(ColorActivity.this, mainColorRes); - ColorStateList bgTintStateList = ContextCompat.getColorStateList(ColorActivity.this, bgTintRes); - int mainColorInt = ContextCompat.getColor(ColorActivity.this, mainColorRes); - - EventsActivity.Data.setColorS(Color); - - spinnerS.setBackgroundColor(mainColorInt); - - TeleExample2.setStrokeColor(mainColorStateList); - TeleExample2.setBackgroundTintList(bgTintStateList); - - AutoExample1.setStrokeColor(mainColorStateList); - AutoExample1.setBackgroundTintList(bgTintStateList); - } - } - - @Override - public void onNothingSelected(AdapterView parentView) {} - }); - } -} diff --git a/Generator/app/src/main/res/drawable/loop.png b/Generator/app/src/main/res/drawable/loop.png new file mode 100644 index 0000000..b43dbd2 Binary files /dev/null and b/Generator/app/src/main/res/drawable/loop.png differ diff --git a/Generator/app/src/main/res/drawable/looppng.webp b/Generator/app/src/main/res/drawable/looppng.webp deleted file mode 100644 index 61fa691..0000000 Binary files a/Generator/app/src/main/res/drawable/looppng.webp and /dev/null differ diff --git a/Generator/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/Generator/app/src/main/res/mipmap-hdpi/ic_launcher.webp index 76eed6f..9b664b6 100644 Binary files a/Generator/app/src/main/res/mipmap-hdpi/ic_launcher.webp and b/Generator/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/Generator/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/Generator/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp index 85683d7..0e9148a 100644 Binary files a/Generator/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp and b/Generator/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/Generator/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.webp b/Generator/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.webp index 7fea60a..9ec28c8 100644 Binary files a/Generator/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.webp and b/Generator/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.webp differ diff --git a/Generator/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/Generator/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp index dbc190f..36afa03 100644 Binary files a/Generator/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/Generator/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/Generator/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/Generator/app/src/main/res/mipmap-mdpi/ic_launcher.webp index b6b9c67..5bdb714 100644 Binary files a/Generator/app/src/main/res/mipmap-mdpi/ic_launcher.webp and b/Generator/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/Generator/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/Generator/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp index 08fc59f..bc34a0c 100644 Binary files a/Generator/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp and b/Generator/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/Generator/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.webp b/Generator/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.webp index 61a95b4..d118c5a 100644 Binary files a/Generator/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.webp and b/Generator/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.webp differ diff --git a/Generator/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/Generator/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp index c3d598c..e91cbbb 100644 Binary files a/Generator/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/Generator/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/Generator/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/Generator/app/src/main/res/mipmap-xhdpi/ic_launcher.webp index ff54bc9..4b6273b 100644 Binary files a/Generator/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/Generator/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/Generator/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/Generator/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp index df2b65f..83d33c2 100644 Binary files a/Generator/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp and b/Generator/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/Generator/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.webp b/Generator/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.webp index 1951de9..356f10f 100644 Binary files a/Generator/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.webp and b/Generator/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.webp differ diff --git a/Generator/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/Generator/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp index bca490b..17217bb 100644 Binary files a/Generator/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/Generator/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/Generator/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/Generator/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp index 05b44f1..dacd8bc 100644 Binary files a/Generator/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/Generator/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/Generator/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/Generator/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp index fd20c54..42dbc06 100644 Binary files a/Generator/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp and b/Generator/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/Generator/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.webp b/Generator/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.webp index 8b88461..0468f53 100644 Binary files a/Generator/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.webp and b/Generator/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.webp differ diff --git a/Generator/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/Generator/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp index f754b41..9de5a46 100644 Binary files a/Generator/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/Generator/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/Generator/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/Generator/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp index 6d3c095..f072e9c 100644 Binary files a/Generator/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/Generator/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/Generator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/Generator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp index e486dc9..ee90a99 100644 Binary files a/Generator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp and b/Generator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/Generator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp b/Generator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp index 858ca92..1bf8a42 100644 Binary files a/Generator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp and b/Generator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp differ diff --git a/Generator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/Generator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp index 0b8475f..78ad1b8 100644 Binary files a/Generator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/Generator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/Generator/app/src/main/res/values/strings.xml b/Generator/app/src/main/res/values/strings.xml index eb1c261..9a82d1f 100644 --- a/Generator/app/src/main/res/values/strings.xml +++ b/Generator/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - Scouting App + ScoutConfig Submit No climb Only shoot Preload? diff --git a/Generator/settings.gradle.kts b/Generator/settings.gradle.kts index 8bcbe73..8ad8878 100644 --- a/Generator/settings.gradle.kts +++ b/Generator/settings.gradle.kts @@ -16,9 +16,6 @@ dependencyResolutionManagement { repositories { google() mavenCentral() - maven { - url = uri("https://frcmaven.wpi.edu/artifactory/release/") - } } } diff --git a/ScoutingApp/.gradle/8.13/executionHistory/executionHistory.bin b/ScoutingApp/.gradle/8.13/executionHistory/executionHistory.bin index 78918c9..0ddd41d 100644 Binary files a/ScoutingApp/.gradle/8.13/executionHistory/executionHistory.bin and b/ScoutingApp/.gradle/8.13/executionHistory/executionHistory.bin differ diff --git a/ScoutingApp/.gradle/8.13/executionHistory/executionHistory.lock b/ScoutingApp/.gradle/8.13/executionHistory/executionHistory.lock index d70e710..f68f740 100644 Binary files a/ScoutingApp/.gradle/8.13/executionHistory/executionHistory.lock and b/ScoutingApp/.gradle/8.13/executionHistory/executionHistory.lock differ diff --git a/ScoutingApp/.gradle/8.13/fileHashes/fileHashes.bin b/ScoutingApp/.gradle/8.13/fileHashes/fileHashes.bin index 1124e13..fcfd3a2 100644 Binary files a/ScoutingApp/.gradle/8.13/fileHashes/fileHashes.bin and b/ScoutingApp/.gradle/8.13/fileHashes/fileHashes.bin differ diff --git a/ScoutingApp/.gradle/8.13/fileHashes/fileHashes.lock b/ScoutingApp/.gradle/8.13/fileHashes/fileHashes.lock index c71e561..d5396e7 100644 Binary files a/ScoutingApp/.gradle/8.13/fileHashes/fileHashes.lock and b/ScoutingApp/.gradle/8.13/fileHashes/fileHashes.lock differ diff --git a/ScoutingApp/.gradle/8.13/fileHashes/resourceHashesCache.bin b/ScoutingApp/.gradle/8.13/fileHashes/resourceHashesCache.bin index 2f21510..d770915 100644 Binary files a/ScoutingApp/.gradle/8.13/fileHashes/resourceHashesCache.bin and b/ScoutingApp/.gradle/8.13/fileHashes/resourceHashesCache.bin differ diff --git a/ScoutingApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/ScoutingApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 113f5c8..f1d2c26 100644 Binary files a/ScoutingApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/ScoutingApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/ScoutingApp/.idea/assetWizardSettings.xml b/ScoutingApp/.idea/assetWizardSettings.xml index a121110..e201765 100644 --- a/ScoutingApp/.idea/assetWizardSettings.xml +++ b/ScoutingApp/.idea/assetWizardSettings.xml @@ -24,7 +24,7 @@ @@ -68,7 +68,7 @@ @@ -80,8 +80,9 @@ @@ -109,12 +110,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -131,7 +180,7 @@ @@ -175,7 +224,7 @@ @@ -239,7 +288,7 @@ @@ -280,6 +329,11 @@ + diff --git a/ScoutingApp/app/build.gradle.kts b/ScoutingApp/app/build.gradle.kts index 8c1f0c1..69b6bca 100644 --- a/ScoutingApp/app/build.gradle.kts +++ b/ScoutingApp/app/build.gradle.kts @@ -3,11 +3,11 @@ plugins { } android { - namespace = "com.team2648.scoutingapp" + namespace = "com.example.scoutingapp" compileSdk = 36 defaultConfig { - applicationId = "com.team2648.scoutingapp" + applicationId = "com.example.scoutingapp" minSdk = 23 targetSdk = 34 versionCode = 6 diff --git a/ScoutingApp/app/build/intermediates/apk/debug/app-debug.apk b/ScoutingApp/app/build/intermediates/apk/debug/app-debug.apk index 10ba9e3..aafb726 100644 Binary files a/ScoutingApp/app/build/intermediates/apk/debug/app-debug.apk and b/ScoutingApp/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/ScoutingApp/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/processDebugResources/R.jar b/ScoutingApp/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/processDebugResources/R.jar index 3a0739f..bbcfa24 100644 Binary files a/ScoutingApp/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/processDebugResources/R.jar and b/ScoutingApp/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/processDebugResources/R.jar differ diff --git a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_0/graph.bin b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_0/graph.bin index 3526fcb..761bc0b 100644 Binary files a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_0/graph.bin and b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_1/graph.bin b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_1/graph.bin index 03c81cd..b1c8fec 100644 Binary files a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_1/graph.bin and b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_2/graph.bin b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_2/graph.bin index 3631370..feeef06 100644 Binary files a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_2/graph.bin and b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_2/graph.bin differ diff --git a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_3/graph.bin b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_3/graph.bin index f211437..952a195 100644 Binary files a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_3/graph.bin and b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_3/graph.bin differ diff --git a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_4/graph.bin b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_4/graph.bin index 07cc58c..91c557f 100644 Binary files a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_4/graph.bin and b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_4/graph.bin differ diff --git a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_5/graph.bin b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_5/graph.bin index a144f17..27ecde8 100644 Binary files a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_5/graph.bin and b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_5/graph.bin differ diff --git a/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex b/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex index cfa5c71..5e8a49c 100644 Binary files a/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex and b/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex differ diff --git a/ScoutingApp/app/build/intermediates/dex_archive_input_jar_hashes/debug/dexBuilderDebug/out b/ScoutingApp/app/build/intermediates/dex_archive_input_jar_hashes/debug/dexBuilderDebug/out index 6e647f9..8094cf5 100644 Binary files a/ScoutingApp/app/build/intermediates/dex_archive_input_jar_hashes/debug/dexBuilderDebug/out and b/ScoutingApp/app/build/intermediates/dex_archive_input_jar_hashes/debug/dexBuilderDebug/out differ diff --git a/ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index f845fa4..7265fec 100644 --- a/ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Thu Jul 30 14:03:39 EDT 2026 +#Thu Jul 30 19:03:32 EDT 2026 com.example.scoutingapp-main-38\:/drawable/_025_reefscape_transparent_background.png=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/drawable__025_reefscape_transparent_background.png.flat com.example.scoutingapp-main-38\:/drawable/_025_reefscape_transparent_background_blue.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/drawable__025_reefscape_transparent_background_blue.webp.flat com.example.scoutingapp-main-38\:/drawable/fieldwithstartingpos.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/drawable_fieldwithstartingpos.webp.flat @@ -16,18 +16,23 @@ com.example.scoutingapp-main-38\:/mipmap-anydpi-v26/ic_launcher.xml=/home/cayden com.example.scoutingapp-main-38\:/mipmap-anydpi-v26/ic_launcher_round.xml=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-anydpi-v26_ic_launcher_round.xml.flat com.example.scoutingapp-main-38\:/mipmap-hdpi/ic_launcher.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-hdpi_ic_launcher.webp.flat com.example.scoutingapp-main-38\:/mipmap-hdpi/ic_launcher_foreground.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-hdpi_ic_launcher_foreground.webp.flat +com.example.scoutingapp-main-38\:/mipmap-hdpi/ic_launcher_monochrome.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-hdpi_ic_launcher_monochrome.webp.flat com.example.scoutingapp-main-38\:/mipmap-hdpi/ic_launcher_round.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-hdpi_ic_launcher_round.webp.flat com.example.scoutingapp-main-38\:/mipmap-mdpi/ic_launcher.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-mdpi_ic_launcher.webp.flat com.example.scoutingapp-main-38\:/mipmap-mdpi/ic_launcher_foreground.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-mdpi_ic_launcher_foreground.webp.flat +com.example.scoutingapp-main-38\:/mipmap-mdpi/ic_launcher_monochrome.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-mdpi_ic_launcher_monochrome.webp.flat com.example.scoutingapp-main-38\:/mipmap-mdpi/ic_launcher_round.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-mdpi_ic_launcher_round.webp.flat com.example.scoutingapp-main-38\:/mipmap-xhdpi/ic_launcher.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-xhdpi_ic_launcher.webp.flat com.example.scoutingapp-main-38\:/mipmap-xhdpi/ic_launcher_foreground.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-xhdpi_ic_launcher_foreground.webp.flat +com.example.scoutingapp-main-38\:/mipmap-xhdpi/ic_launcher_monochrome.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-xhdpi_ic_launcher_monochrome.webp.flat com.example.scoutingapp-main-38\:/mipmap-xhdpi/ic_launcher_round.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-xhdpi_ic_launcher_round.webp.flat com.example.scoutingapp-main-38\:/mipmap-xxhdpi/ic_launcher.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-xxhdpi_ic_launcher.webp.flat com.example.scoutingapp-main-38\:/mipmap-xxhdpi/ic_launcher_foreground.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-xxhdpi_ic_launcher_foreground.webp.flat +com.example.scoutingapp-main-38\:/mipmap-xxhdpi/ic_launcher_monochrome.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-xxhdpi_ic_launcher_monochrome.webp.flat com.example.scoutingapp-main-38\:/mipmap-xxhdpi/ic_launcher_round.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-xxhdpi_ic_launcher_round.webp.flat com.example.scoutingapp-main-38\:/mipmap-xxxhdpi/ic_launcher.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-xxxhdpi_ic_launcher.webp.flat com.example.scoutingapp-main-38\:/mipmap-xxxhdpi/ic_launcher_foreground.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-xxxhdpi_ic_launcher_foreground.webp.flat +com.example.scoutingapp-main-38\:/mipmap-xxxhdpi/ic_launcher_monochrome.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-xxxhdpi_ic_launcher_monochrome.webp.flat com.example.scoutingapp-main-38\:/mipmap-xxxhdpi/ic_launcher_round.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-xxxhdpi_ic_launcher_round.webp.flat com.example.scoutingapp-main-38\:/raw/info.json=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/raw_info.json.flat com.example.scoutingapp-main-38\:/xml/backup_rules.xml=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/xml_backup_rules.xml.flat diff --git a/ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index dc8a393..8d9ee0c 100644 --- a/ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -12297,7 +12297,7 @@ Aşağıdakı vərəqi yığcamlaşdırınAşağıdakı vərəqi genişləndirinTam genişləndirinDəstək%1$d/%2$d simvol daxil edilibSimvol limiti %1$d/%2$d dəyərini keçdiMətni silinXəta: yanlışdırXətaAçılan menyunu göstərinDialoq ikonasıTabYüklənirGündüz və ya axşam seçin%1$s saatSaatı seçinSaat %1$sDəqiqə seçin%1$s dəqiqəSıranın sonuSıranın başlanğıcıDəyərAMZamanı daxil etmək üçün saat rejiminə keçinSaatDəqiqəGƏVaxt seçinZamanı daxil etmək üçün mətnlə daxiletmə rejiminə keçinYeni bildirişİşarələnibQismən işarələnibİşarələnməyib%1$s silinMinimum %1$d yeni bildirişNövbəti aya dəyişinƏvvəlki aya dəyişinBaşlama tarixi seçimi: %1$s – Bitmə tarixi seçimi: %2$sCari seçim: %1$syoxdurLəğv edinOK%1$sTarix seçinSeçilmiş tarix%1$sBitmə tarixi: %1$sYanlış format.Nümunə: %1$s%1$s istifadə edinYanlış diapazon.Cari ilə keçin: %1$d%1$d ilinə keçinƏhatə dairəsindən kənar: %1$sBaşlama tarixi – %1$s%1$s – Bitmə tarixi%1$s: %2$sAralıq seçinBaşlama tarixi - Bitmə tarixiSaxlayınBaşlama tarixi: %1$sTarixBitmə tarixiBaşlama tarixigünayilBugün: %1$sTəqvim daxiletmə rejiminə keçinTəqvim görünüşünə dəyişinMətn daxiletmə rejiminə keçinİl görünüşünə dəyişinTəqvim görünüşünə keçildiİl görünüşünə keçildiLəğv edinOKParolu göstərinMətni təmizləyinGeriYan Vərəq#FF000000#FFFFFFFF#FF5722#40FF5722#AAAAAA#F71000#0084ff#0EE906#400EE906#000000#FF000000#FFFFFFFF#FF5722#40FF5722#AAAAAA#F71000#0084ff#0EE906#400EE906#000000#FF000000#FFFFFFFF#FF5722#40FF5722#AAAAAA#F71000#0084ff#0EE906#400EE906#000000#FF000000#FFFFFFFF#FF5722#40FF5722#AAAAAA#F71000#0084ff#0EE906#400EE906#000000