sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Student info and Teachers screens unification (#1279)

Browse Source
This commit is contained in:
Damian Czupryn 2021-04-12 21:58:58 +02:00 committed by GitHub
parent 13ccfda009
commit b453225941
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/res/layout/item_student_info.xml
View File

@ -11,14 +11,14 @@
<TextView
android:id="@+id/student_info_item_title"
android:layout_width="match_parent"
android:layout_height="28dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="5dp"
android:layout_marginTop="13dp"
android:layout_marginEnd="16dp"
android:gravity="bottom"
android:maxLines="1"
android:textColor="?android:textColorPrimary"
android:textSize="16sp"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@ -27,15 +27,16 @@
<TextView
android:id="@+id/student_info_item_subtitle"
android:layout_width="match_parent"
android:layout_height="18dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:gravity="bottom"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
android:textColor="?android:textColorPrimary"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/student_info_item_title"
tools:text="@tools:sample/lorem/random" />
</androidx.constraintlayout.widget.ConstraintLayout>

53
app/src/main/res/layout/item_teacher.xml
View File

@ -12,37 +12,44 @@
tools:context=".ui.modules.schoolandteachers.teacher.TeacherAdapter">
<TextView
android:id="@+id/teacherItemName"
android:id="@+id/teacherItemSubject"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginStart="10dp"
android:ellipsize="end"
android:maxLines="1"
android:textSize="17sp"
tools:text="@tools:sample/full_names" />
<TextView
android:id="@+id/teacherItemShortName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="40dp"
android:layout_toEndOf="@+id/teacherItemName"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
android:textSize="17sp"
tools:text="[LI]" />
<TextView
android:id="@+id/teacherItemSubject"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/teacherItemName"
android:layout_alignStart="@id/teacherItemName"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:text="11:11-12:00" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_below="@+id/teacherItemSubject"
android:layout_marginStart="10dp">
<TextView
android:id="@+id/teacherItemName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textSize="16sp"
tools:text="@tools:sample/full_names" />
<TextView
android:id="@+id/teacherItemShortName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="40dp"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
android:textSize="16sp"
tools:text="[LI]" />
</LinearLayout>
</RelativeLayout>