worked on a lot of nothing

This commit is contained in:
2026-07-30 20:17:41 -04:00
parent 28f78cac54
commit 0e0e517491
125 changed files with 113 additions and 235 deletions

View File

@@ -6,6 +6,7 @@
<entry key="01409295-cd1f-40b7-889f-fd5c31385b52" value="false" /> <entry key="01409295-cd1f-40b7-889f-fd5c31385b52" value="false" />
<entry key="0220642f-001c-43ee-b5b0-6e6a0ca006b8" value="false" /> <entry key="0220642f-001c-43ee-b5b0-6e6a0ca006b8" value="false" />
<entry key="6620918d-77fb-4150-93dd-35d485d51d30" value="false" /> <entry key="6620918d-77fb-4150-93dd-35d485d51d30" value="false" />
<entry key="67c97c21-8e0e-44b1-b765-5cac5091c82d" value="false" />
</map> </map>
</option> </option>
</component> </component>

View File

@@ -62,10 +62,6 @@ dependencies {
implementation(libs.activity) implementation(libs.activity)
implementation(libs.constraintlayout) implementation(libs.constraintlayout)
// FRC NetworkTables Dependencies (Kotlin DSL Syntax)
implementation(libs.ntcore.java)
implementation(libs.wpiutil.java)
// Google Sheets & Core API // Google Sheets & Core API
implementation("com.google.apis:google-api-services-sheets:v4-rev581-1.25.0") { implementation("com.google.apis:google-api-services-sheets:v4-rev581-1.25.0") {
exclude(group = "com.google.guava", module = "listenablefuture") exclude(group = "com.google.guava", module = "listenablefuture")

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 85 KiB

View File

@@ -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<CharSequence> 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<CharSequence> 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) {}
});
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

@@ -1,5 +1,5 @@
<resources> <resources>
<string name="app_name">Scouting App</string> <string name="app_name">ScoutConfig</string>
<string name="submit">Submit</string> <string name="submit">Submit</string>
<string name="l0">No climb</string> <string name="l0">No climb</string>
<string name="Preload">Only shoot Preload?</string> <string name="Preload">Only shoot Preload?</string>

View File

@@ -16,9 +16,6 @@ dependencyResolutionManagement {
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
maven {
url = uri("https://frcmaven.wpi.edu/artifactory/release/")
}
} }
} }

View File

@@ -24,7 +24,7 @@
<option name="values"> <option name="values">
<map> <map>
<entry key="color" value="000000" /> <entry key="color" value="000000" />
<entry key="imagePath" value="C:\Users\cayde\AppData\Local\Temp\ic_android_black_24dp.xml" /> <entry key="imagePath" value="/tmp/ic_android_black_24dp.xml" />
</map> </map>
</option> </option>
</PersistentState> </PersistentState>
@@ -68,7 +68,7 @@
<option name="values"> <option name="values">
<map> <map>
<entry key="color" value="000000" /> <entry key="color" value="000000" />
<entry key="imagePath" value="C:\Users\cayde\AppData\Local\Temp\ic_android_black_24dp.xml" /> <entry key="imagePath" value="/tmp/ic_android_black_24dp.xml" />
</map> </map>
</option> </option>
</PersistentState> </PersistentState>
@@ -80,8 +80,9 @@
<option name="values"> <option name="values">
<map> <map>
<entry key="color" value="000000" /> <entry key="color" value="000000" />
<entry key="imagePath" value="C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\res\drawable\loop.png" /> <entry key="imagePath" value="$PROJECT_DIR$/app/src/main/res/drawable/loop.png" />
<entry key="scalingPercent" value="60" /> <entry key="scalingPercent" value="90" />
<entry key="trimmed" value="true" />
</map> </map>
</option> </option>
</PersistentState> </PersistentState>
@@ -109,12 +110,60 @@
</PersistentState> </PersistentState>
</value> </value>
</entry> </entry>
<entry key="monochromeClipArt">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="imagePath" value="/tmp/ic_android_black_24dp.xml" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="monochromeImage">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
<entry key="imagePath" value="$PROJECT_DIR$/app/src/main/res/drawable/loop.png" />
<entry key="scalingPercent" value="84" />
<entry key="trimmed" value="true" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="monochromeText">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="monochromeTextAsset">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
</map>
</option>
</PersistentState>
</value>
</entry>
</map> </map>
</option> </option>
<option name="values"> <option name="values">
<map> <map>
<entry key="backgroundAssetType" value="COLOR" /> <entry key="backgroundAssetType" value="COLOR" />
<entry key="backgroundColor" value="000000" /> <entry key="backgroundColor" value="000000" />
<entry key="showGrid" value="true" />
</map> </map>
</option> </option>
</PersistentState> </PersistentState>
@@ -131,7 +180,7 @@
<option name="values"> <option name="values">
<map> <map>
<entry key="color" value="000000" /> <entry key="color" value="000000" />
<entry key="imagePath" value="C:\Users\cayde\AppData\Local\Temp\ic_android_black_24dp.xml" /> <entry key="imagePath" value="/tmp/ic_android_black_24dp.xml" />
</map> </map>
</option> </option>
</PersistentState> </PersistentState>
@@ -175,7 +224,7 @@
<option name="values"> <option name="values">
<map> <map>
<entry key="color" value="000000" /> <entry key="color" value="000000" />
<entry key="imagePath" value="C:\Users\cayde\AppData\Local\Temp\ic_android_black_24dp.xml" /> <entry key="imagePath" value="/tmp/ic_android_black_24dp.xml" />
</map> </map>
</option> </option>
</PersistentState> </PersistentState>
@@ -239,7 +288,7 @@
<PersistentState> <PersistentState>
<option name="values"> <option name="values">
<map> <map>
<entry key="imagePath" value="C:\Users\cayde\AppData\Local\Temp\ic_android_black_24dp.xml" /> <entry key="imagePath" value="/tmp/ic_android_black_24dp.xml" />
</map> </map>
</option> </option>
</PersistentState> </PersistentState>
@@ -280,6 +329,11 @@
</entry> </entry>
</map> </map>
</option> </option>
<option name="values">
<map>
<entry key="showGrid" value="true" />
</map>
</option>
</PersistentState> </PersistentState>
</value> </value>
</entry> </entry>

View File

@@ -3,11 +3,11 @@ plugins {
} }
android { android {
namespace = "com.team2648.scoutingapp" namespace = "com.example.scoutingapp"
compileSdk = 36 compileSdk = 36
defaultConfig { defaultConfig {
applicationId = "com.team2648.scoutingapp" applicationId = "com.example.scoutingapp"
minSdk = 23 minSdk = 23
targetSdk = 34 targetSdk = 34
versionCode = 6 versionCode = 6

View File

@@ -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.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/_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 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-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.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_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-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.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_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-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.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_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-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.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_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-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.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_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\:/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\:/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 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

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,4 @@
#Thu Jul 30 14:03:39 EDT 2026 #Thu Jul 30 19:03:32 EDT 2026
com.example.scoutingapp-main-5\:/drawable/_025_reefscape_transparent_background.png=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/_025_reefscape_transparent_background.png com.example.scoutingapp-main-5\:/drawable/_025_reefscape_transparent_background.png=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/_025_reefscape_transparent_background.png
com.example.scoutingapp-main-5\:/drawable/_025_reefscape_transparent_background_blue.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/_025_reefscape_transparent_background_blue.webp com.example.scoutingapp-main-5\:/drawable/_025_reefscape_transparent_background_blue.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/_025_reefscape_transparent_background_blue.webp
com.example.scoutingapp-main-5\:/drawable/fieldwithstartingpos.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/fieldwithstartingpos.webp com.example.scoutingapp-main-5\:/drawable/fieldwithstartingpos.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/fieldwithstartingpos.webp
@@ -17,18 +17,23 @@ com.example.scoutingapp-main-5\:/mipmap-anydpi-v26/ic_launcher.xml=/home/cayden/
com.example.scoutingapp-main-5\:/mipmap-anydpi-v26/ic_launcher_round.xml=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-anydpi-v26/ic_launcher_round.xml com.example.scoutingapp-main-5\:/mipmap-anydpi-v26/ic_launcher_round.xml=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-anydpi-v26/ic_launcher_round.xml
com.example.scoutingapp-main-5\:/mipmap-hdpi/ic_launcher.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-hdpi-v4/ic_launcher.webp com.example.scoutingapp-main-5\:/mipmap-hdpi/ic_launcher.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-hdpi-v4/ic_launcher.webp
com.example.scoutingapp-main-5\:/mipmap-hdpi/ic_launcher_foreground.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-hdpi-v4/ic_launcher_foreground.webp com.example.scoutingapp-main-5\:/mipmap-hdpi/ic_launcher_foreground.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-hdpi-v4/ic_launcher_foreground.webp
com.example.scoutingapp-main-5\:/mipmap-hdpi/ic_launcher_monochrome.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-hdpi-v4/ic_launcher_monochrome.webp
com.example.scoutingapp-main-5\:/mipmap-hdpi/ic_launcher_round.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-hdpi-v4/ic_launcher_round.webp com.example.scoutingapp-main-5\:/mipmap-hdpi/ic_launcher_round.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-hdpi-v4/ic_launcher_round.webp
com.example.scoutingapp-main-5\:/mipmap-mdpi/ic_launcher.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-mdpi-v4/ic_launcher.webp com.example.scoutingapp-main-5\:/mipmap-mdpi/ic_launcher.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-mdpi-v4/ic_launcher.webp
com.example.scoutingapp-main-5\:/mipmap-mdpi/ic_launcher_foreground.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-mdpi-v4/ic_launcher_foreground.webp com.example.scoutingapp-main-5\:/mipmap-mdpi/ic_launcher_foreground.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-mdpi-v4/ic_launcher_foreground.webp
com.example.scoutingapp-main-5\:/mipmap-mdpi/ic_launcher_monochrome.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-mdpi-v4/ic_launcher_monochrome.webp
com.example.scoutingapp-main-5\:/mipmap-mdpi/ic_launcher_round.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-mdpi-v4/ic_launcher_round.webp com.example.scoutingapp-main-5\:/mipmap-mdpi/ic_launcher_round.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-mdpi-v4/ic_launcher_round.webp
com.example.scoutingapp-main-5\:/mipmap-xhdpi/ic_launcher.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xhdpi-v4/ic_launcher.webp com.example.scoutingapp-main-5\:/mipmap-xhdpi/ic_launcher.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xhdpi-v4/ic_launcher.webp
com.example.scoutingapp-main-5\:/mipmap-xhdpi/ic_launcher_foreground.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xhdpi-v4/ic_launcher_foreground.webp com.example.scoutingapp-main-5\:/mipmap-xhdpi/ic_launcher_foreground.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xhdpi-v4/ic_launcher_foreground.webp
com.example.scoutingapp-main-5\:/mipmap-xhdpi/ic_launcher_monochrome.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xhdpi-v4/ic_launcher_monochrome.webp
com.example.scoutingapp-main-5\:/mipmap-xhdpi/ic_launcher_round.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xhdpi-v4/ic_launcher_round.webp com.example.scoutingapp-main-5\:/mipmap-xhdpi/ic_launcher_round.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xhdpi-v4/ic_launcher_round.webp
com.example.scoutingapp-main-5\:/mipmap-xxhdpi/ic_launcher.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xxhdpi-v4/ic_launcher.webp com.example.scoutingapp-main-5\:/mipmap-xxhdpi/ic_launcher.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xxhdpi-v4/ic_launcher.webp
com.example.scoutingapp-main-5\:/mipmap-xxhdpi/ic_launcher_foreground.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xxhdpi-v4/ic_launcher_foreground.webp com.example.scoutingapp-main-5\:/mipmap-xxhdpi/ic_launcher_foreground.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xxhdpi-v4/ic_launcher_foreground.webp
com.example.scoutingapp-main-5\:/mipmap-xxhdpi/ic_launcher_monochrome.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xxhdpi-v4/ic_launcher_monochrome.webp
com.example.scoutingapp-main-5\:/mipmap-xxhdpi/ic_launcher_round.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xxhdpi-v4/ic_launcher_round.webp com.example.scoutingapp-main-5\:/mipmap-xxhdpi/ic_launcher_round.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xxhdpi-v4/ic_launcher_round.webp
com.example.scoutingapp-main-5\:/mipmap-xxxhdpi/ic_launcher.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xxxhdpi-v4/ic_launcher.webp com.example.scoutingapp-main-5\:/mipmap-xxxhdpi/ic_launcher.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xxxhdpi-v4/ic_launcher.webp
com.example.scoutingapp-main-5\:/mipmap-xxxhdpi/ic_launcher_foreground.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xxxhdpi-v4/ic_launcher_foreground.webp com.example.scoutingapp-main-5\:/mipmap-xxxhdpi/ic_launcher_foreground.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xxxhdpi-v4/ic_launcher_foreground.webp
com.example.scoutingapp-main-5\:/mipmap-xxxhdpi/ic_launcher_monochrome.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xxxhdpi-v4/ic_launcher_monochrome.webp
com.example.scoutingapp-main-5\:/mipmap-xxxhdpi/ic_launcher_round.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xxxhdpi-v4/ic_launcher_round.webp com.example.scoutingapp-main-5\:/mipmap-xxxhdpi/ic_launcher_round.webp=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-xxxhdpi-v4/ic_launcher_round.webp
com.example.scoutingapp-main-5\:/raw/info.json=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/raw/info.json com.example.scoutingapp-main-5\:/raw/info.json=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/raw/info.json
com.example.scoutingapp-main-5\:/xml/backup_rules.xml=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/xml/backup_rules.xml com.example.scoutingapp-main-5\:/xml/backup_rules.xml=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/xml/backup_rules.xml

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,4 @@
#Thu Jul 30 14:05:23 EDT 2026 #Thu Jul 30 19:03:33 EDT 2026
base.0=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex base.0=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex
base.1=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex base.1=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex
base.2=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex base.2=/home/cayden/Desktop/Other/ScoutingApp/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex

View File

@@ -104,6 +104,7 @@ layout activity_starting
layout activity_tele layout activity_tele
mipmap ic_launcher mipmap ic_launcher
mipmap ic_launcher_foreground mipmap ic_launcher_foreground
mipmap ic_launcher_monochrome
mipmap ic_launcher_round mipmap ic_launcher_round
raw info raw info
string D0 string D0

View File

@@ -1,4 +1,8 @@
[ [
{
"merged": "com.example.scoutingapp-debug-36:/mipmap-xxhdpi_ic_launcher_monochrome.webp.flat",
"source": "com.example.scoutingapp-main-38:/mipmap-xxhdpi/ic_launcher_monochrome.webp"
},
{ {
"merged": "com.example.scoutingapp-debug-36:/drawable-xhdpi_ic_launcher_foreground.png.flat", "merged": "com.example.scoutingapp-debug-36:/drawable-xhdpi_ic_launcher_foreground.png.flat",
"source": "com.example.scoutingapp-pngs-32:/drawable-xhdpi/ic_launcher_foreground.png" "source": "com.example.scoutingapp-pngs-32:/drawable-xhdpi/ic_launcher_foreground.png"
@@ -15,6 +19,10 @@
"merged": "com.example.scoutingapp-debug-36:/drawable-mdpi_ic_launcher_foreground.png.flat", "merged": "com.example.scoutingapp-debug-36:/drawable-mdpi_ic_launcher_foreground.png.flat",
"source": "com.example.scoutingapp-pngs-32:/drawable-mdpi/ic_launcher_foreground.png" "source": "com.example.scoutingapp-pngs-32:/drawable-mdpi/ic_launcher_foreground.png"
}, },
{
"merged": "com.example.scoutingapp-debug-36:/mipmap-xhdpi_ic_launcher_monochrome.webp.flat",
"source": "com.example.scoutingapp-main-38:/mipmap-xhdpi/ic_launcher_monochrome.webp"
},
{ {
"merged": "com.example.scoutingapp-debug-36:/drawable-xxxhdpi_ic_launcher_foreground.png.flat", "merged": "com.example.scoutingapp-debug-36:/drawable-xxxhdpi_ic_launcher_foreground.png.flat",
"source": "com.example.scoutingapp-pngs-32:/drawable-xxxhdpi/ic_launcher_foreground.png" "source": "com.example.scoutingapp-pngs-32:/drawable-xxxhdpi/ic_launcher_foreground.png"
@@ -91,6 +99,10 @@
"merged": "com.example.scoutingapp-debug-36:/mipmap-xxhdpi_ic_launcher.webp.flat", "merged": "com.example.scoutingapp-debug-36:/mipmap-xxhdpi_ic_launcher.webp.flat",
"source": "com.example.scoutingapp-main-38:/mipmap-xxhdpi/ic_launcher.webp" "source": "com.example.scoutingapp-main-38:/mipmap-xxhdpi/ic_launcher.webp"
}, },
{
"merged": "com.example.scoutingapp-debug-36:/mipmap-xxxhdpi_ic_launcher_monochrome.webp.flat",
"source": "com.example.scoutingapp-main-38:/mipmap-xxxhdpi/ic_launcher_monochrome.webp"
},
{ {
"merged": "com.example.scoutingapp-debug-36:/mipmap-mdpi_ic_launcher.webp.flat", "merged": "com.example.scoutingapp-debug-36:/mipmap-mdpi_ic_launcher.webp.flat",
"source": "com.example.scoutingapp-main-38:/mipmap-mdpi/ic_launcher.webp" "source": "com.example.scoutingapp-main-38:/mipmap-mdpi/ic_launcher.webp"
@@ -127,6 +139,10 @@
"merged": "com.example.scoutingapp-debug-36:/drawable-anydpi-v24_ic_launcher_foreground.xml.flat", "merged": "com.example.scoutingapp-debug-36:/drawable-anydpi-v24_ic_launcher_foreground.xml.flat",
"source": "com.example.scoutingapp-pngs-32:/drawable-anydpi-v24/ic_launcher_foreground.xml" "source": "com.example.scoutingapp-pngs-32:/drawable-anydpi-v24/ic_launcher_foreground.xml"
}, },
{
"merged": "com.example.scoutingapp-debug-36:/mipmap-mdpi_ic_launcher_monochrome.webp.flat",
"source": "com.example.scoutingapp-main-38:/mipmap-mdpi/ic_launcher_monochrome.webp"
},
{ {
"merged": "com.example.scoutingapp-debug-36:/mipmap-hdpi_ic_launcher_round.webp.flat", "merged": "com.example.scoutingapp-debug-36:/mipmap-hdpi_ic_launcher_round.webp.flat",
"source": "com.example.scoutingapp-main-38:/mipmap-hdpi/ic_launcher_round.webp" "source": "com.example.scoutingapp-main-38:/mipmap-hdpi/ic_launcher_round.webp"
@@ -143,6 +159,10 @@
"merged": "com.example.scoutingapp-debug-36:/mipmap-xhdpi_ic_launcher_round.webp.flat", "merged": "com.example.scoutingapp-debug-36:/mipmap-xhdpi_ic_launcher_round.webp.flat",
"source": "com.example.scoutingapp-main-38:/mipmap-xhdpi/ic_launcher_round.webp" "source": "com.example.scoutingapp-main-38:/mipmap-xhdpi/ic_launcher_round.webp"
}, },
{
"merged": "com.example.scoutingapp-debug-36:/mipmap-hdpi_ic_launcher_monochrome.webp.flat",
"source": "com.example.scoutingapp-main-38:/mipmap-hdpi/ic_launcher_monochrome.webp"
},
{ {
"merged": "com.example.scoutingapp-debug-36:/mipmap-anydpi-v26_ic_launcher.xml.flat", "merged": "com.example.scoutingapp-debug-36:/mipmap-anydpi-v26_ic_launcher.xml.flat",
"source": "com.example.scoutingapp-main-38:/mipmap-anydpi-v26/ic_launcher.xml" "source": "com.example.scoutingapp-main-38:/mipmap-anydpi-v26/ic_launcher.xml"

View File

@@ -2,4 +2,5 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/> <background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/> <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
</adaptive-icon> </adaptive-icon>

View File

@@ -2,4 +2,5 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/> <background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/> <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
</adaptive-icon> </adaptive-icon>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

@@ -4473,7 +4473,8 @@ int layout select_dialog_singlechoice_material 0x7f0b0072
int layout support_simple_spinner_dropdown_item 0x7f0b0073 int layout support_simple_spinner_dropdown_item 0x7f0b0073
int mipmap ic_launcher 0x7f0d0000 int mipmap ic_launcher 0x7f0d0000
int mipmap ic_launcher_foreground 0x7f0d0001 int mipmap ic_launcher_foreground 0x7f0d0001
int mipmap ic_launcher_round 0x7f0d0002 int mipmap ic_launcher_monochrome 0x7f0d0002
int mipmap ic_launcher_round 0x7f0d0003
int plurals mtrl_badge_content_description 0x7f0e0000 int plurals mtrl_badge_content_description 0x7f0e0000
int raw info 0x7f0f0000 int raw info 0x7f0f0000
int string D0 0x7f100000 int string D0 0x7f100000

View File

@@ -167,6 +167,7 @@ com.example.scoutingapp:style/Widget.MaterialComponents.CompoundButton.CheckBox
com.example.scoutingapp:style/Widget.MaterialComponents.CollapsingToolbar = 0x7f11047c com.example.scoutingapp:style/Widget.MaterialComponents.CollapsingToolbar = 0x7f11047c
com.example.scoutingapp:style/Widget.MaterialComponents.CircularProgressIndicator.Small = 0x7f11047b com.example.scoutingapp:style/Widget.MaterialComponents.CircularProgressIndicator.Small = 0x7f11047b
com.example.scoutingapp:style/Widget.MaterialComponents.CircularProgressIndicator.ExtraSmall = 0x7f110479 com.example.scoutingapp:style/Widget.MaterialComponents.CircularProgressIndicator.ExtraSmall = 0x7f110479
com.example.scoutingapp:style/Widget.MaterialComponents.CircularProgressIndicator = 0x7f110478
com.example.scoutingapp:attr/barrierMargin = 0x7f030067 com.example.scoutingapp:attr/barrierMargin = 0x7f030067
com.example.scoutingapp:style/Widget.MaterialComponents.Chip.Filter = 0x7f110476 com.example.scoutingapp:style/Widget.MaterialComponents.Chip.Filter = 0x7f110476
com.example.scoutingapp:dimen/abc_action_bar_elevation_material = 0x7f060005 com.example.scoutingapp:dimen/abc_action_bar_elevation_material = 0x7f060005
@@ -774,7 +775,7 @@ com.example.scoutingapp:style/Widget.Material3.MaterialTimePicker.Display.Divide
com.example.scoutingapp:style/Base.V23.Theme.AppCompat.Light = 0x7f1100ae com.example.scoutingapp:style/Base.V23.Theme.AppCompat.Light = 0x7f1100ae
com.example.scoutingapp:style/Base.V23.Theme.AppCompat = 0x7f1100ad com.example.scoutingapp:style/Base.V23.Theme.AppCompat = 0x7f1100ad
com.example.scoutingapp:color/m3_ref_palette_green70 = 0x7f05013b com.example.scoutingapp:color/m3_ref_palette_green70 = 0x7f05013b
com.example.scoutingapp:mipmap/ic_launcher_round = 0x7f0d0002 com.example.scoutingapp:mipmap/ic_launcher_round = 0x7f0d0003
com.example.scoutingapp:style/Base.V22.Theme.AppCompat = 0x7f1100ab com.example.scoutingapp:style/Base.V22.Theme.AppCompat = 0x7f1100ab
com.example.scoutingapp:style/Base.V21.ThemeOverlay.Material3.BottomSheetDialog = 0x7f1100a9 com.example.scoutingapp:style/Base.V21.ThemeOverlay.Material3.BottomSheetDialog = 0x7f1100a9
com.example.scoutingapp:style/Base.V21.Theme.MaterialComponents.Light = 0x7f1100a6 com.example.scoutingapp:style/Base.V21.Theme.MaterialComponents.Light = 0x7f1100a6
@@ -2118,7 +2119,6 @@ com.example.scoutingapp:id/button_Next = 0x7f080093
com.example.scoutingapp:id/mtrl_calendar_year_selector_frame = 0x7f080159 com.example.scoutingapp:id/mtrl_calendar_year_selector_frame = 0x7f080159
com.example.scoutingapp:string/fab_transformation_scrim_behavior = 0x7f100046 com.example.scoutingapp:string/fab_transformation_scrim_behavior = 0x7f100046
com.example.scoutingapp:id/buttonPanel = 0x7f080091 com.example.scoutingapp:id/buttonPanel = 0x7f080091
com.example.scoutingapp:style/Widget.MaterialComponents.CircularProgressIndicator = 0x7f110478
com.example.scoutingapp:id/buttonNext = 0x7f080090 com.example.scoutingapp:id/buttonNext = 0x7f080090
com.example.scoutingapp:id/buttonNHDUR = 0x7f08008f com.example.scoutingapp:id/buttonNHDUR = 0x7f08008f
com.example.scoutingapp:id/buttonMEFAL = 0x7f08008d com.example.scoutingapp:id/buttonMEFAL = 0x7f08008d
@@ -2314,6 +2314,7 @@ com.example.scoutingapp:id/parent_matrix = 0x7f08019d
com.example.scoutingapp:color/m3_sys_color_dynamic_light_primary = 0x7f050254 com.example.scoutingapp:color/m3_sys_color_dynamic_light_primary = 0x7f050254
com.example.scoutingapp:drawable/mtrl_ic_check_mark = 0x7f0700c9 com.example.scoutingapp:drawable/mtrl_ic_check_mark = 0x7f0700c9
com.example.scoutingapp:drawable/mtrl_ic_arrow_drop_up = 0x7f0700c7 com.example.scoutingapp:drawable/mtrl_ic_arrow_drop_up = 0x7f0700c7
com.example.scoutingapp:mipmap/ic_launcher_monochrome = 0x7f0d0002
com.example.scoutingapp:drawable/mtrl_dialog_background = 0x7f0700c4 com.example.scoutingapp:drawable/mtrl_dialog_background = 0x7f0700c4
com.example.scoutingapp:drawable/mtrl_checkbox_button_icon_indeterminate_checked = 0x7f0700bf com.example.scoutingapp:drawable/mtrl_checkbox_button_icon_indeterminate_checked = 0x7f0700bf
com.example.scoutingapp:dimen/mtrl_badge_toolbar_action_menu_item_horizontal_offset = 0x7f060335 com.example.scoutingapp:dimen/mtrl_badge_toolbar_action_menu_item_horizontal_offset = 0x7f060335

View File

@@ -4474,6 +4474,7 @@ layout select_dialog_singlechoice_material
layout support_simple_spinner_dropdown_item layout support_simple_spinner_dropdown_item
mipmap ic_launcher mipmap ic_launcher
mipmap ic_launcher_foreground mipmap ic_launcher_foreground
mipmap ic_launcher_monochrome
mipmap ic_launcher_round mipmap ic_launcher_round
plurals mtrl_badge_content_description plurals mtrl_badge_content_description
raw info raw info

Some files were not shown because too many files have changed in this diff Show More