diff --git a/.gitignore b/.gitignore index 8a6040ad..f52c5638 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ benchmark_data.csv + +data analysis/keys/keytemp.json +data analysis/__pycache__/analysis.cpython-37.pyc +apps/android/source/app/src/main/res/drawable-v24/uuh.png +apps/android/source/app/src/main/java/com/example/titanscouting/tits.java diff --git a/README.md b/README.md new file mode 100644 index 00000000..e7e10dbb --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# tr2022-strategy +Titan Robotics 2022 Strategy Team Repository +TIT SCOUT diff --git a/apps/android/apk/1.0.0.002/app-debug.apk b/apps/android/apk/1.0.0.002/app-debug.apk new file mode 100644 index 00000000..07204948 Binary files /dev/null and b/apps/android/apk/1.0.0.002/app-debug.apk differ diff --git a/apps/android/apk/1.0.0.003/app-debug.apk b/apps/android/apk/1.0.0.003/app-debug.apk new file mode 100644 index 00000000..c5ca98f8 Binary files /dev/null and b/apps/android/apk/1.0.0.003/app-debug.apk differ diff --git a/apps/android/source/app/src/main/AndroidManifest.xml b/apps/android/source/app/src/main/AndroidManifest.xml index ea1d3d50..abe95ceb 100644 --- a/apps/android/source/app/src/main/AndroidManifest.xml +++ b/apps/android/source/app/src/main/AndroidManifest.xml @@ -2,7 +2,7 @@ - + - - - - + android:theme="@style/AppTheme" + android:usesCleartextTraffic="true"> + + + + + \ No newline at end of file diff --git a/apps/android/source/app/src/main/java/com/example/titanscouting/launcher.java b/apps/android/source/app/src/main/java/com/example/titanscouting/launcher.java new file mode 100644 index 00000000..93ad4434 --- /dev/null +++ b/apps/android/source/app/src/main/java/com/example/titanscouting/launcher.java @@ -0,0 +1,49 @@ +package com.example.titanscouting; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.app.Activity; +import android.content.Intent; +import android.view.Menu; +import android.view.View; +import android.view.View.OnClickListener; +import android.widget.Button; +import android.widget.EditText; +public class launcher extends AppCompatActivity { + + Button button; + EditText passField; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_launcher); + + // Locate the button in activity_main.xml + button = (Button) findViewById(R.id.launch_button); + final EditText passField = (EditText)findViewById(R.id.editText); + // Capture button clicks + button.setOnClickListener(new OnClickListener() { + public void onClick(View arg0) { + + // Start NewActivity.class + if(passField.getText().toString().equals("gimmetits")){ + + Intent myIntent = new Intent(launcher.this, + tits.class); + startActivity(myIntent); + + } + else { + Intent myIntent = new Intent(launcher.this, + MainActivity.class); + startActivity(myIntent); + } + } + }); + + } + + + +} diff --git a/apps/android/source/app/src/main/java/com/example/titanscouting/tits.java b/apps/android/source/app/src/main/java/com/example/titanscouting/tits.java new file mode 100644 index 00000000..336684b3 --- /dev/null +++ b/apps/android/source/app/src/main/java/com/example/titanscouting/tits.java @@ -0,0 +1,30 @@ +package com.example.titanscouting; + +import android.content.Intent; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; + +public class tits extends AppCompatActivity { + Button button; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_tits); + + button = (Button) findViewById(R.id.button); + // Capture button clicks + button.setOnClickListener(new View.OnClickListener() { + public void onClick(View arg0) { + + + Intent myIntent = new Intent(tits.this, + MainActivity.class); + startActivity(myIntent); + + } + }); + } +} diff --git a/apps/android/source/app/src/main/res/layout/activity_launcher.xml b/apps/android/source/app/src/main/res/layout/activity_launcher.xml new file mode 100644 index 00000000..c1b4f2c5 --- /dev/null +++ b/apps/android/source/app/src/main/res/layout/activity_launcher.xml @@ -0,0 +1,42 @@ + + + +