github/wulkanowy-mirror
Archived
1
0
Fork 1
Code Activity

Show points sum in grades details (#664)

Browse Source
This commit is contained in:
Mikołaj Pich
2020-01-26 02:16:05 +01:00
committed by Rafał Borcz
parent 1999cd6eaf
commit ae9b616896
12 changed files with 76 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/fragment_attendance.xml
View File

@ -64,9 +64,9 @@
android:layout_margin="16dp"
android:clickable="true"
android:focusable="true"
android:text="@string/attendance_excuse_title"
android:tint="?colorOnSecondary"
android:visibility="gone"
android:text="@string/attendance_excuse_title"
app:icon="@drawable/ic_all_done_all"
tools:visibility="visible" />

30
app/src/main/res/layout/header_grade_details.xml
View File

@ -4,13 +4,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:paddingStart="16dp"
android:paddingLeft="16dp"
android:paddingTop="10dp"
android:paddingEnd="12dp"
android:paddingRight="14dp"
android:paddingBottom="10dp"
tools:context=".ui.modules.grade.details.GradeDetailsHeader"
android:paddingEnd="12dp"
android:paddingStart="16dp">
tools:context=".ui.modules.grade.details.GradeDetailsHeader">
<TextView
android:id="@+id/gradeHeaderSubject"
@ -35,6 +35,20 @@
android:textSize="12sp"
tools:text="Average: 6,00" />
<TextView
android:id="@+id/gradeHeaderPointsSum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/gradeHeaderSubject"
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="5dp"
android:layout_toEndOf="@+id/gradeHeaderAverage"
android:layout_toRightOf="@+id/gradeHeaderAverage"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:text="Points: 123/200 (61,5%)" />
<TextView
android:id="@+id/gradeHeaderNumber"
android:layout_width="wrap_content"
@ -43,8 +57,8 @@
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="5dp"
android:layout_toEndOf="@+id/gradeHeaderAverage"
android:layout_toRightOf="@+id/gradeHeaderAverage"
android:layout_toEndOf="@+id/gradeHeaderPointsSum"
android:layout_toRightOf="@+id/gradeHeaderPointsSum"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:text="12 grades" />
@ -53,13 +67,13 @@
android:id="@+id/gradeHeaderNote"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginTop="10dp"
android:background="@drawable/background_header_note"
android:gravity="center"
android:minWidth="20dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:paddingLeft="5dp"
android:layout_marginTop="10dp"
android:paddingRight="5dp"
android:textColor="?colorOnPrimary"
android:textSize="14sp"