Compare commits
3 Commits
eabfadfaea
...
252811daa5
| Author | SHA1 | Date | |
|---|---|---|---|
| 252811daa5 | |||
| df66702b62 | |||
| 135d9ae243 |
@@ -2,7 +2,8 @@
|
|||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:tools="http://schemas.android.com/tools">
|
xmlns:tools="http://schemas.android.com/tools">
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET"/>
|
||||||
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
|
|||||||
@@ -46,6 +46,8 @@ public class Data {
|
|||||||
|
|
||||||
private String CheckBox4;
|
private String CheckBox4;
|
||||||
|
|
||||||
|
private int climbLevels;
|
||||||
|
|
||||||
|
|
||||||
public String getBase64() {
|
public String getBase64() {
|
||||||
return base64;
|
return base64;
|
||||||
@@ -286,6 +288,12 @@ public class Data {
|
|||||||
return CheckBox4;
|
return CheckBox4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getClimbLevels(){
|
||||||
|
return climbLevels;}
|
||||||
|
|
||||||
|
public void setClimbLevels(int climbLevels){
|
||||||
|
this.climbLevels = climbLevels;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -25,12 +25,6 @@ public class MakeCheckActivity extends AppCompatActivity {
|
|||||||
private EditText Ob2;
|
private EditText Ob2;
|
||||||
private EditText Ob3;
|
private EditText Ob3;
|
||||||
private EditText Ob4;
|
private EditText Ob4;
|
||||||
private EditText Ob5;
|
|
||||||
private EditText Ob6;
|
|
||||||
private EditText Ob7;
|
|
||||||
private EditText Ob8;
|
|
||||||
private EditText Ob9;
|
|
||||||
|
|
||||||
private String ColorP = "";
|
private String ColorP = "";
|
||||||
private String ColorS = "";
|
private String ColorS = "";
|
||||||
private int mainColorResP = 0;
|
private int mainColorResP = 0;
|
||||||
@@ -51,6 +45,7 @@ public class MakeCheckActivity extends AppCompatActivity {
|
|||||||
EditText Ob2 = (EditText) findViewById(R.id.CheckBox2);
|
EditText Ob2 = (EditText) findViewById(R.id.CheckBox2);
|
||||||
EditText Ob3 = (EditText) findViewById(R.id.CheckBox3);
|
EditText Ob3 = (EditText) findViewById(R.id.CheckBox3);
|
||||||
EditText Ob4 = (EditText) findViewById(R.id.CheckBox4);
|
EditText Ob4 = (EditText) findViewById(R.id.CheckBox4);
|
||||||
|
EditText Ob5 = (EditText) findViewById(R.id.Levels);
|
||||||
Ob1.setVisibility(View.GONE);
|
Ob1.setVisibility(View.GONE);
|
||||||
Ob2.setVisibility(View.GONE);
|
Ob2.setVisibility(View.GONE);
|
||||||
Ob3.setVisibility(View.GONE);
|
Ob3.setVisibility(View.GONE);
|
||||||
@@ -103,6 +98,7 @@ public class MakeCheckActivity extends AppCompatActivity {
|
|||||||
EventsActivity.Data.setCheckBox2(Ob2.getText().toString());
|
EventsActivity.Data.setCheckBox2(Ob2.getText().toString());
|
||||||
EventsActivity.Data.setCheckBox3(Ob3.getText().toString());
|
EventsActivity.Data.setCheckBox3(Ob3.getText().toString());
|
||||||
EventsActivity.Data.setCheckBox4(Ob4.getText().toString());
|
EventsActivity.Data.setCheckBox4(Ob4.getText().toString());
|
||||||
|
EventsActivity.Data.setClimbLevels(Integer.parseInt(Ob5.getText().toString()));
|
||||||
EventsActivity.Data.setNumCheckBoxes(Integer.parseInt(CheckBoxObjects.getText().toString()));
|
EventsActivity.Data.setNumCheckBoxes(Integer.parseInt(CheckBoxObjects.getText().toString()));
|
||||||
Intent intent = new Intent(this, MakeAutoActivity2.class);
|
Intent intent = new Intent(this, MakeAutoActivity2.class);
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/textPine4"
|
android:id="@+id/textViewTitle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="32dp"
|
android:layout_height="32dp"
|
||||||
android:ems="10"
|
android:ems="10"
|
||||||
@@ -163,7 +163,7 @@
|
|||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintHorizontal_bias="0.0"
|
app:layout_constraintHorizontal_bias="0.0"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/textPine4" />
|
app:layout_constraintTop_toBottomOf="@+id/textViewTitle" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/nextButton"
|
android:id="@+id/nextButton"
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
tools:context=".MakeAutoActivity2">
|
tools:context=".MakeAutoActivity2">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/textPine4"
|
android:id="@+id/textViewTitle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="32dp"
|
android:layout_height="32dp"
|
||||||
android:ems="10"
|
android:ems="10"
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintHorizontal_bias="0.0"
|
app:layout_constraintHorizontal_bias="0.0"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/textPine4" />
|
app:layout_constraintTop_toBottomOf="@+id/textViewTitle" />
|
||||||
|
|
||||||
<com.google.android.material.tabs.TabLayout
|
<com.google.android.material.tabs.TabLayout
|
||||||
android:id="@+id/tabLayout"
|
android:id="@+id/tabLayout"
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/textPine4"
|
android:id="@+id/textViewTitle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="32dp"
|
android:layout_height="32dp"
|
||||||
android:ems="10"
|
android:ems="10"
|
||||||
@@ -37,6 +37,21 @@
|
|||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/NumCheckBox" />
|
app:layout_constraintTop_toBottomOf="@+id/NumCheckBox" />
|
||||||
|
|
||||||
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
|
android:id="@+id/Levels"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:hint="How many levels?"
|
||||||
|
android:imeOptions="actionDone"
|
||||||
|
android:inputType="text|textCapSentences"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textColorHint="@color/gray_hint"
|
||||||
|
app:layout_constraintBottom_toTopOf="@+id/backButton"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/textView2" />
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
android:id="@+id/CheckBox2"
|
android:id="@+id/CheckBox2"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
@@ -94,7 +109,7 @@
|
|||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintHorizontal_bias="0.0"
|
app:layout_constraintHorizontal_bias="0.0"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/textPine4" />
|
app:layout_constraintTop_toBottomOf="@+id/textViewTitle" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/nextButton"
|
android:id="@+id/nextButton"
|
||||||
@@ -127,13 +142,35 @@
|
|||||||
android:id="@+id/textView2"
|
android:id="@+id/textView2"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="there is 2 check boxes by defualt you can't edit, in auto 'doesn't have auto' and in teleop 'robot dead'"
|
|
||||||
android:gravity="center_horizontal"
|
android:gravity="center_horizontal"
|
||||||
|
android:text="there is 2 check boxes by defualt you can't edit, in auto 'doesn't have auto' and in teleop 'robot dead'"
|
||||||
android:textColor="@color/white"
|
android:textColor="@color/white"
|
||||||
app:layout_constraintBottom_toTopOf="@+id/backButton"
|
app:layout_constraintBottom_toTopOf="@+id/guideline"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/CheckBox3" />
|
app:layout_constraintTop_toBottomOf="@+id/CheckBox3" />
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.Guideline
|
||||||
|
android:id="@+id/guideline"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintGuide_percent="0.5"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView3"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="How many climb levels"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="24sp"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintHorizontal_bias="0.545"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/guideline" />
|
||||||
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
tools:context=".MakeTeleActivity">
|
tools:context=".MakeTeleActivity">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/textPine4"
|
android:id="@+id/textViewTitle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="32dp"
|
android:layout_height="32dp"
|
||||||
android:ems="10"
|
android:ems="10"
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintHorizontal_bias="0.0"
|
app:layout_constraintHorizontal_bias="0.0"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/textPine4" />
|
app:layout_constraintTop_toBottomOf="@+id/textViewTitle" />
|
||||||
|
|
||||||
<com.google.android.material.tabs.TabLayout
|
<com.google.android.material.tabs.TabLayout
|
||||||
android:id="@+id/tabLayout"
|
android:id="@+id/tabLayout"
|
||||||
|
|||||||
0
Generator/gradlew
vendored
Normal file → Executable file
0
Generator/gradlew
vendored
Normal file → Executable file
Reference in New Issue
Block a user