diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt index 1a3fc16f..8f36d746 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt @@ -4,6 +4,7 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.View.GONE +import android.view.View.INVISIBLE import android.view.View.VISIBLE import android.view.ViewGroup import android.widget.ArrayAdapter @@ -101,7 +102,7 @@ class AttendanceSummaryFragment : BaseSessionFragment(), AttendanceSummaryView, } override fun showSubjects(show: Boolean) { - attendanceSummarySubjects.visibility = if (show) VISIBLE else VISIBLE + attendanceSummarySubjectsContainer.visibility = if (show) VISIBLE else INVISIBLE } override fun hideRefresh() { diff --git a/app/src/main/res/layout/fragment_attendance_summary.xml b/app/src/main/res/layout/fragment_attendance_summary.xml index a3bdeb48..5d03c2f4 100644 --- a/app/src/main/res/layout/fragment_attendance_summary.xml +++ b/app/src/main/res/layout/fragment_attendance_summary.xml @@ -2,22 +2,40 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + tools:context=".ui.modules.attendance.summary.AttendanceSummaryFragment"> - + android:padding="5dp" + android:visibility="invisible" + tools:listitem="@layout/item_attendance_summary" + tools:targetApi="lollipop" + tools:visibility="visible"> + + + + android:layout_height="match_parent" + tools:listitem="@layout/item_attendance_summary" /> diff --git a/app/src/main/res/layout/item_attendance_summary.xml b/app/src/main/res/layout/item_attendance_summary.xml index 9a254038..07392e56 100644 --- a/app/src/main/res/layout/item_attendance_summary.xml +++ b/app/src/main/res/layout/item_attendance_summary.xml @@ -1,5 +1,6 @@ @@ -21,16 +22,16 @@ android:layout_marginEnd="40dp" android:layout_marginRight="40dp" android:layout_weight="1" - android:text="@string/app_name" - android:textSize="17sp" /> + android:textSize="17sp" + tools:text="January" /> + android:textSize="12sp" + tools:text="75%" /> + android:textSize="12sp" + tools:text="50" /> + android:textSize="12sp" + tools:text="0" /> + android:textSize="12sp" + tools:text="25" /> + android:textSize="12sp" + tools:text="0" /> + android:textSize="12sp" + tools:text="6" /> + android:textSize="12sp" + tools:text="0" /> + android:textSize="12sp" + tools:text="0" /> diff --git a/app/src/main/res/layout/item_attendance_summary_subject.xml b/app/src/main/res/layout/item_attendance_summary_subject.xml index ce8e9b5e..6e19a081 100644 --- a/app/src/main/res/layout/item_attendance_summary_subject.xml +++ b/app/src/main/res/layout/item_attendance_summary_subject.xml @@ -10,5 +10,6 @@ android:paddingRight="16dp" android:textAlignment="textStart" android:paddingBottom="12dp" + android:ellipsize="end" android:text="@string/app_name" android:textSize="16sp" />