Merge branch 'master' of https://localhost:8080/misty/modbus-project
This commit is contained in:
		
							
								
								
									
										17
									
								
								app/src/main/res/drawable/ic_main_zylinder_1.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								app/src/main/res/drawable/ic_main_zylinder_1.xml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,17 @@
 | 
				
			|||||||
 | 
					<?xml version="1.0" encoding="utf-8"?>
 | 
				
			||||||
 | 
					<vector xmlns:android="http://schemas.android.com/apk/res/android"
 | 
				
			||||||
 | 
					    android:width="47.65295dp"
 | 
				
			||||||
 | 
					    android:height="15.538606dp"
 | 
				
			||||||
 | 
					    android:viewportWidth="47.65295"
 | 
				
			||||||
 | 
					    android:viewportHeight="15.538606">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <group
 | 
				
			||||||
 | 
					        android:translateX="-50.428954"
 | 
				
			||||||
 | 
					        android:translateY="-154.38768">
 | 
				
			||||||
 | 
					        <path
 | 
				
			||||||
 | 
					            android:strokeColor="#000000"
 | 
				
			||||||
 | 
					            android:strokeWidth="1"
 | 
				
			||||||
 | 
					            android:strokeLineCap="round"
 | 
				
			||||||
 | 
					            android:pathData="M 97.765593,154.69195 v 14.93006 m -14.197441,-7.46503 c 14.209481,0 14.209481,0 14.209481,0 m -46.926664,-7.46502 h 32.559754 c 0.0676,0 0.122015,0.0544 0.122015,0.12201 V 169.5 c 0,0.0676 -0.05442,0.12201 -0.122015,0.12201 H 50.850969 c -0.0676,0 -0.122015,-0.0544 -0.122015,-0.12201 v -14.68603 c 0,-0.0676 0.05442,-0.12201 0.122015,-0.12201 z" />
 | 
				
			||||||
 | 
					    </group>
 | 
				
			||||||
 | 
					</vector>
 | 
				
			||||||
@@ -6,4 +6,90 @@
 | 
				
			|||||||
    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
 | 
				
			||||||
 | 
					        android:id="@+id/textView10"
 | 
				
			||||||
 | 
					        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" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <ToggleButton
 | 
				
			||||||
 | 
					        android:id="@+id/toggleButton"
 | 
				
			||||||
 | 
					        android:layout_width="117dp"
 | 
				
			||||||
 | 
					        android:layout_height="46dp"
 | 
				
			||||||
 | 
					        android:layout_marginEnd="8dp"
 | 
				
			||||||
 | 
					        android:layout_marginStart="8dp"
 | 
				
			||||||
 | 
					        android:layout_marginTop="8dp"
 | 
				
			||||||
 | 
					        android:text="ToggleButton"
 | 
				
			||||||
 | 
					        android:textOff="Aktivieren"
 | 
				
			||||||
 | 
					        android:textOn="Deaktivieren"
 | 
				
			||||||
 | 
					        app:layout_constraintEnd_toEndOf="parent"
 | 
				
			||||||
 | 
					        app:layout_constraintStart_toStartOf="parent"
 | 
				
			||||||
 | 
					        app:layout_constraintTop_toBottomOf="@+id/textView" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <TextView
 | 
				
			||||||
 | 
					        android:id="@+id/textView11"
 | 
				
			||||||
 | 
					        android:layout_width="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_marginBottom="8dp"
 | 
				
			||||||
 | 
					        android:layout_marginEnd="8dp"
 | 
				
			||||||
 | 
					        android:layout_marginStart="8dp"
 | 
				
			||||||
 | 
					        android:text="H2"
 | 
				
			||||||
 | 
					        app:layout_constraintBottom_toTopOf="@+id/toggleButton4"
 | 
				
			||||||
 | 
					        app:layout_constraintEnd_toEndOf="@+id/toggleButton4"
 | 
				
			||||||
 | 
					        app:layout_constraintStart_toStartOf="@+id/toggleButton4" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <TextView
 | 
				
			||||||
 | 
					        android:id="@+id/textView12"
 | 
				
			||||||
 | 
					        android:layout_width="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_marginBottom="8dp"
 | 
				
			||||||
 | 
					        android:layout_marginEnd="8dp"
 | 
				
			||||||
 | 
					        android:layout_marginStart="8dp"
 | 
				
			||||||
 | 
					        android:text="H1"
 | 
				
			||||||
 | 
					        app:layout_constraintBottom_toTopOf="@+id/toggleButton3"
 | 
				
			||||||
 | 
					        app:layout_constraintEnd_toEndOf="@+id/toggleButton3"
 | 
				
			||||||
 | 
					        app:layout_constraintStart_toStartOf="@+id/toggleButton3" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <ToggleButton
 | 
				
			||||||
 | 
					        android:id="@+id/toggleButton3"
 | 
				
			||||||
 | 
					        android:layout_width="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
 | 
					        android:text="ToggleButton"
 | 
				
			||||||
 | 
					        android:textOff="Unten"
 | 
				
			||||||
 | 
					        android:textOn="Oben"
 | 
				
			||||||
 | 
					        app:layout_constraintEnd_toStartOf="@+id/toggleButton4"
 | 
				
			||||||
 | 
					        app:layout_constraintHorizontal_bias="0.5"
 | 
				
			||||||
 | 
					        app:layout_constraintStart_toStartOf="parent"
 | 
				
			||||||
 | 
					        tools:layout_editor_absoluteY="128dp" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <ToggleButton
 | 
				
			||||||
 | 
					        android:id="@+id/toggleButton4"
 | 
				
			||||||
 | 
					        android:layout_width="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
 | 
					        android:text="ToggleButton"
 | 
				
			||||||
 | 
					        android:textOff="Oben"
 | 
				
			||||||
 | 
					        android:textOn="Unten"
 | 
				
			||||||
 | 
					        app:layout_constraintEnd_toEndOf="parent"
 | 
				
			||||||
 | 
					        app:layout_constraintHorizontal_bias="0.5"
 | 
				
			||||||
 | 
					        app:layout_constraintStart_toEndOf="@+id/toggleButton3"
 | 
				
			||||||
 | 
					        tools:layout_editor_absoluteY="128dp" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
</android.support.constraint.ConstraintLayout>
 | 
					</android.support.constraint.ConstraintLayout>
 | 
				
			||||||
		Reference in New Issue
	
	Block a user