ITL-Stefan/sps-modbus-app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

layout changes to manual drive

Browse Source
This commit is contained in:
root 2018-06-15 17:03:38 +02:00
parent b66adac25a
commit 141f39bcd4
3 changed files with 184 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/example/user/myapp/DisplayMessageActivity.java
View File

@ -150,10 +150,10 @@ public class DisplayMessageActivity extends AppCompatActivity {
TextView textView10 = findViewById(R.id.textView10); TextView textView10 = findViewById(R.id.textView10);
textView10.setText(new Boolean(booleanArray[0]).toString()); textView10.setText(new Boolean(booleanArray[0]).toString());
TextView textView11 = findViewById(R.id.textView11); TextView textView11 = findViewById(R.id.h2_textview);
textView11.setText(new Boolean(booleanArray[1]).toString()); textView11.setText(new Boolean(booleanArray[1]).toString());
TextView textView12 = findViewById(R.id.textView12); TextView textView12 = findViewById(R.id.h1_textview);
textView12.setText(new Boolean(booleanArray[2]).toString()); textView12.setText(new Boolean(booleanArray[2]).toString());
TextView textView13 = findViewById(R.id.textView13); TextView textView13 = findViewById(R.id.textView13);

12
app/src/main/res/layout/activity_display_message.xml
View File

@ -124,17 +124,17 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/textView11" android:id="@+id/h2_textview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:text="TextView" android:text="TextView"
app:layout_constraintBottom_toTopOf="@+id/textView12" app:layout_constraintBottom_toTopOf="@+id/h1_textview"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<TextView <TextView
android:id="@+id/textView12" android:id="@+id/h1_textview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
@ -153,7 +153,7 @@
android:layout_marginTop="52dp" android:layout_marginTop="52dp"
android:text="TextView" android:text="TextView"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView12" /> app:layout_constraintTop_toBottomOf="@+id/h1_textview" />
<TextView <TextView
android:id="@+id/textView14" android:id="@+id/textView14"
@ -178,7 +178,7 @@
app:layout_constraintBottom_toTopOf="@+id/textView16" app:layout_constraintBottom_toTopOf="@+id/textView16"
app:layout_constraintEnd_toStartOf="@+id/textView18" app:layout_constraintEnd_toStartOf="@+id/textView18"
app:layout_constraintHorizontal_bias="0.705" app:layout_constraintHorizontal_bias="0.705"
app:layout_constraintStart_toEndOf="@+id/textView11" /> app:layout_constraintStart_toEndOf="@+id/h2_textview" />
<TextView <TextView
android:id="@+id/textView16" android:id="@+id/textView16"
@ -190,7 +190,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/textView19" app:layout_constraintEnd_toStartOf="@+id/textView19"
app:layout_constraintHorizontal_bias="0.652" app:layout_constraintHorizontal_bias="0.652"
app:layout_constraintStart_toEndOf="@+id/textView12" app:layout_constraintStart_toEndOf="@+id/h1_textview"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.753" /> app:layout_constraintVertical_bias="0.753" />

205
app/src/main/res/layout/activity_manual_drive.xml
View File

@ -6,20 +6,9 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".ManualDriveActivity"> tools:context=".ManualDriveActivity">
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:text="Manueller Modus"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/textView10" android:id="@+id/manual_override_textview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
@ -31,65 +20,223 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<ToggleButton <ToggleButton
android:id="@+id/toggleButton" android:id="@+id/manual_override_button"
android:layout_width="117dp" android:layout_width="125dp"
android:layout_height="46dp" android:layout_height="46dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:checked="false"
android:text="ToggleButton" android:text="ToggleButton"
android:textColorLink="@android:color/holo_green_light"
android:textOff="Aktivieren" android:textOff="Aktivieren"
android:textOn="Deaktivieren" android:textOn="Deaktivieren"
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/textView" /> app:layout_constraintTop_toBottomOf="@+id/manual_override_textview" />
<TextView <TextView
android:id="@+id/textView11" android:id="@+id/h2_textview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:text="H2" android:text="H2"
app:layout_constraintBottom_toTopOf="@+id/toggleButton4" app:layout_constraintBottom_toTopOf="@+id/h2_control_button"
app:layout_constraintEnd_toEndOf="@+id/toggleButton4" app:layout_constraintEnd_toEndOf="@+id/h2_control_button"
app:layout_constraintStart_toStartOf="@+id/toggleButton4" /> app:layout_constraintStart_toStartOf="@+id/h2_control_button" />
<TextView <TextView
android:id="@+id/textView12" android:id="@+id/h1_textview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:text="H1" android:text="H1"
app:layout_constraintBottom_toTopOf="@+id/toggleButton3" app:layout_constraintBottom_toTopOf="@+id/h1_control_button"
app:layout_constraintEnd_toEndOf="@+id/toggleButton3" app:layout_constraintEnd_toEndOf="@+id/h1_control_button"
app:layout_constraintStart_toStartOf="@+id/toggleButton3" /> app:layout_constraintStart_toStartOf="@+id/h1_control_button" />
<ToggleButton <ToggleButton
android:id="@+id/toggleButton3" android:id="@+id/h1_control_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:checked="false"
android:text="ToggleButton" android:text="ToggleButton"
android:textColorLink="@android:color/holo_green_light"
android:textOff="Unten" android:textOff="Unten"
android:textOn="Oben" android:textOn="Oben"
app:layout_constraintEnd_toStartOf="@+id/toggleButton4" app:layout_constraintEnd_toStartOf="@+id/h2_control_button"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
tools:layout_editor_absoluteY="128dp" /> app:layout_constraintTop_toBottomOf="@+id/manual_override_button" />
<ToggleButton <ToggleButton
android:id="@+id/toggleButton4" android:id="@+id/h2_control_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="ToggleButton" android:text="ToggleButton"
android:textColorLink="@android:color/holo_green_light"
android:textOff="Oben" android:textOff="Oben"
android:textOn="Unten" android:textOn="Unten"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/toggleButton3" app:layout_constraintStart_toEndOf="@+id/h1_control_button"
tools:layout_editor_absoluteY="128dp" /> app:layout_constraintTop_toBottomOf="@+id/manual_override_button" />
<ImageView
android:id="@+id/h1_status_light_off"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:visibility="invisible"
app:layout_constraintStart_toEndOf="@+id/h1_control_button"
app:layout_constraintTop_toTopOf="@+id/h1_control_button"
app:srcCompat="@android:drawable/presence_invisible" />
<ImageView
android:id="@+id/h1_status_light_on"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:visibility="invisible"
app:layout_constraintStart_toEndOf="@+id/h1_control_button"
app:layout_constraintTop_toTopOf="@+id/h1_control_button"
app:srcCompat="@android:drawable/presence_online" />
<ImageView
android:id="@+id/h2_status_light_off"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:visibility="invisible"
app:layout_constraintStart_toEndOf="@+id/h2_control_button"
app:layout_constraintTop_toTopOf="@+id/h2_control_button"
app:srcCompat="@android:drawable/presence_invisible" />
<ImageView
android:id="@+id/h2_status_light_on"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:visibility="invisible"
app:layout_constraintStart_toEndOf="@+id/h2_control_button"
app:layout_constraintTop_toTopOf="@+id/h2_control_button"
app:srcCompat="@android:drawable/presence_online" />
<TextView
android:id="@+id/pu1_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:text="PU1"
app:layout_constraintBottom_toTopOf="@+id/pu1_control_button"
app:layout_constraintEnd_toEndOf="@+id/pu1_control_button"
app:layout_constraintHorizontal_bias="0.507"
app:layout_constraintStart_toStartOf="@+id/pu1_control_button" />
<ImageView
android:id="@+id/pu1_status_light_off"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:visibility="invisible"
app:layout_constraintStart_toEndOf="@+id/pu1_control_button"
app:layout_constraintTop_toTopOf="@+id/pu1_control_button"
app:srcCompat="@android:drawable/presence_invisible" />
<ImageView
android:id="@+id/pu1_status_light_on"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:visibility="invisible"
app:layout_constraintStart_toEndOf="@+id/pu1_control_button"
app:layout_constraintTop_toTopOf="@+id/pu1_control_button"
app:srcCompat="@android:drawable/presence_online" />
<TextView
android:id="@+id/pu2_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:text="PU2"
app:layout_constraintBottom_toTopOf="@+id/pu2_control_button"
app:layout_constraintEnd_toEndOf="@+id/pu2_control_button"
app:layout_constraintHorizontal_bias="0.476"
app:layout_constraintStart_toStartOf="@+id/pu2_control_button" />
<Button
android:id="@+id/pu1_control_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginTop="40dp"
android:text="Aktivieren"
app:layout_constraintEnd_toEndOf="@+id/h1_control_button"
app:layout_constraintHorizontal_bias="0.36"
app:layout_constraintStart_toStartOf="@+id/h1_control_button"
app:layout_constraintTop_toBottomOf="@+id/h1_control_button" />
<Button
android:id="@+id/pu2_control_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="40dp"
android:text="Aktivieren"
app:layout_constraintEnd_toEndOf="@+id/h2_control_button"
app:layout_constraintHorizontal_bias="0.68"
app:layout_constraintStart_toStartOf="@+id/h2_control_button"
app:layout_constraintTop_toBottomOf="@+id/h2_control_button" />
<ImageView
android:id="@+id/pu2_status_light_off"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:visibility="invisible"
app:layout_constraintStart_toEndOf="@+id/pu2_control_button"
app:layout_constraintTop_toTopOf="@+id/pu2_control_button"
app:srcCompat="@android:drawable/presence_invisible" />
<ImageView
android:id="@+id/pu2_status_light_on"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:visibility="invisible"
app:layout_constraintStart_toEndOf="@+id/pu2_control_button"
app:layout_constraintTop_toTopOf="@+id/pu2_control_button"
app:srcCompat="@android:drawable/presence_online" />
<android.support.constraint.Barrier
android:id="@+id/barrier2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="top" />
<android.support.constraint.Barrier
android:id="@+id/barrier3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="top" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>