diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml index 940ed47..1a48c6e 100644 --- a/app/src/main/res/layout/fragment_admin.xml +++ b/app/src/main/res/layout/fragment_admin.xml @@ -95,91 +95,98 @@ app:layout_constraintStart_toStartOf="parent" /> - <View - android:id="@+id/username_field" - android:layout_width="320dp" - android:layout_height="40dp" - android:background="@drawable/button_grestroke_whiteback" + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/constraintLayout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.494" - app:layout_constraintTop_toBottomOf="@+id/line" - app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/line"> - <TextView - android:id="@+id/username_view" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="15sp" - android:layout_marginStart="10dp" - android:text="@string/fullNameText" - app:layout_constraintBottom_toBottomOf="@+id/username_field" - app:layout_constraintStart_toStartOf="@+id/username_field" - app:layout_constraintTop_toTopOf="@+id/username_field" - android:textColor="@color/black"/> + <View + android:id="@+id/username_field" + android:layout_width="320dp" + android:layout_height="40dp" + android:background="@drawable/button_grestroke_whiteback" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - <View - android:id="@+id/photo_field" - android:layout_width="80dp" - android:layout_height="80dp" - android:layout_marginTop="20dp" - android:background="@drawable/button_grestroke_whiteback" - app:layout_constraintStart_toStartOf="@+id/username_field" - app:layout_constraintTop_toBottomOf="@+id/username_field" /> + <TextView + android:id="@+id/username_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="10dp" + android:text="@string/fullNameText" + android:textColor="@color/black" + android:textSize="15sp" + app:layout_constraintBottom_toBottomOf="@+id/username_field" + app:layout_constraintStart_toStartOf="@+id/username_field" + app:layout_constraintTop_toTopOf="@+id/username_field" /> - <ImageView - android:id="@+id/photo" - android:layout_width="79dp" - android:layout_height="79dp" - android:layout_gravity="center_horizontal" - android:contentDescription="@string/contentDescriptionPhoto" - android:src="@drawable/ic_no_img" - app:layout_constraintBottom_toBottomOf="@+id/photo_field" - app:layout_constraintEnd_toEndOf="@+id/photo_field" - app:layout_constraintStart_toStartOf="@+id/photo_field" - app:layout_constraintTop_toTopOf="@+id/photo_field" /> + <View + android:id="@+id/photo_field" + android:layout_width="80dp" + android:layout_height="80dp" + android:layout_marginTop="20dp" + android:background="@drawable/button_grestroke_whiteback" + app:layout_constraintStart_toStartOf="@+id/username_field" + app:layout_constraintTop_toBottomOf="@+id/username_field" /> - <View - android:id="@+id/position_field" - android:layout_width="220dp" - android:layout_height="35dp" - android:background="@drawable/button_grestroke_whiteback" - app:layout_constraintEnd_toEndOf="@+id/username_field" - app:layout_constraintTop_toTopOf="@+id/photo_field" /> + <ImageView + android:id="@+id/photo" + android:layout_width="79dp" + android:layout_height="79dp" + android:layout_gravity="center_horizontal" + android:contentDescription="@string/contentDescriptionPhoto" + android:src="@drawable/ic_no_img" + app:layout_constraintBottom_toBottomOf="@+id/photo_field" + app:layout_constraintEnd_toEndOf="@+id/photo_field" + app:layout_constraintStart_toStartOf="@+id/photo_field" + app:layout_constraintTop_toTopOf="@+id/photo_field" /> - <TextView - android:id="@+id/position" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="10dp" - android:text="@string/jobText" - android:textColor="@color/black" - android:textSize="13sp" - app:layout_constraintBottom_toBottomOf="@+id/position_field" - app:layout_constraintStart_toStartOf="@+id/position_field" - app:layout_constraintTop_toTopOf="@+id/position_field" /> + <View + android:id="@+id/position_field" + android:layout_width="220dp" + android:layout_height="35dp" + android:background="@drawable/button_grestroke_whiteback" + app:layout_constraintEnd_toEndOf="@+id/username_field" + app:layout_constraintTop_toTopOf="@+id/photo_field" /> - <View - android:id="@+id/lastEntry_field" - android:layout_width="220dp" - android:layout_height="35dp" - android:background="@drawable/button_grestroke_whiteback" - app:layout_constraintBottom_toBottomOf="@+id/photo_field" - app:layout_constraintStart_toStartOf="@+id/position_field" /> + <TextView + android:id="@+id/position" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="10dp" + android:text="@string/jobText" + android:textColor="@color/black" + android:textSize="13sp" + app:layout_constraintBottom_toBottomOf="@+id/position_field" + app:layout_constraintStart_toStartOf="@+id/position_field" + app:layout_constraintTop_toTopOf="@+id/position_field" /> + + <View + android:id="@+id/lastEntry_field" + android:layout_width="220dp" + android:layout_height="35dp" + android:background="@drawable/button_grestroke_whiteback" + app:layout_constraintBottom_toBottomOf="@+id/photo_field" + app:layout_constraintStart_toStartOf="@+id/position_field" /> - <TextView - android:id="@+id/lastEntry" - android:layout_width="wrap_content" - android:layout_height="18dp" - android:layout_marginStart="8dp" - android:layout_marginTop="10dp" - android:text="@string/lastLoginText" - android:textColor="@color/black" - android:textSize="13sp" - app:layout_constraintBottom_toBottomOf="@+id/lastEntry_field" - app:layout_constraintStart_toStartOf="@+id/lastEntry_field" - app:layout_constraintTop_toTopOf="@+id/lastEntry_field" - app:layout_constraintVertical_bias="0.0" /> + <TextView + android:id="@+id/lastEntry" + android:layout_width="wrap_content" + android:layout_height="18dp" + android:layout_marginStart="8dp" + android:text="@string/lastLoginText" + android:textColor="@color/black" + android:textSize="13sp" + app:layout_constraintBottom_toBottomOf="@+id/lastEntry_field" + app:layout_constraintStart_toStartOf="@+id/lastEntry_field" + app:layout_constraintTop_toTopOf="@+id/lastEntry_field" /> + + </androidx.constraintlayout.widget.ConstraintLayout> <View android:id="@+id/block" @@ -189,7 +196,7 @@ android:background="@drawable/button_grey" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/photo_field" /> + app:layout_constraintTop_toBottomOf="@+id/constraintLayout" /> <TextView android:id="@+id/text_block_user"