diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.kt
index 9ede3f68..80bee3c5 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.kt
@@ -55,7 +55,7 @@ class GradeDetailsDialog(
         b.weightText = manager.getWeightString(app, grade)
         b.commentVisible = false
         b.devMode = App.debugMode
-        b.gradeName.setTextColor(if (ColorUtils.calculateLuminance(gradeColor) > 0.3) -0x1000000 else -0x1)
+        b.gradeName.setTextColor(if (ColorUtils.calculateLuminance(gradeColor) > 0.3) 0x99000000.toInt() else 0x99ffffff.toInt())
         b.gradeName.background.setTintColor(gradeColor)
 
         b.gradeValue = if (grade.weight == 0f || grade.value < 0f) -1f else manager.getGradeValue(grade)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeGradesCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeGradesCard.kt
index 4897c8e7..0e26eb2c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeGradesCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeGradesCard.kt
@@ -4,8 +4,6 @@
 
 package pl.szczodrzynski.edziennik.ui.modules.home.cards
 
-import android.graphics.PorterDuff
-import android.graphics.PorterDuffColorFilter
 import android.graphics.Typeface
 import android.os.Build
 import android.text.TextUtils
@@ -18,7 +16,6 @@ import android.widget.LinearLayout
 import android.widget.LinearLayout.HORIZONTAL
 import android.widget.LinearLayout.LayoutParams.WRAP_CONTENT
 import android.widget.TextView
-import androidx.core.graphics.ColorUtils
 import androidx.core.view.plusAssign
 import androidx.core.view.setMargins
 import androidx.lifecycle.Observer
@@ -28,23 +25,16 @@ import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_FINAL
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_PROPOSED
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_FINAL
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_PROPOSED
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_YEAR_FINAL
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_YEAR_PROPOSED
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Subject
 import pl.szczodrzynski.edziennik.data.db.full.GradeFull
 import pl.szczodrzynski.edziennik.databinding.CardHomeGradesBinding
 import pl.szczodrzynski.edziennik.dp
+import pl.szczodrzynski.edziennik.ui.modules.grades.GradeView
 import pl.szczodrzynski.edziennik.ui.modules.home.HomeCard
 import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardAdapter
 import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
-import pl.szczodrzynski.edziennik.utils.Colors
 import pl.szczodrzynski.edziennik.utils.Utils
-import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.COLOR_MODE_DEFAULT
 import pl.szczodrzynski.edziennik.utils.models.ItemGradesSubjectModel
 import kotlin.coroutines.CoroutineContext
 
@@ -127,32 +117,11 @@ class HomeGradesCard(
                             16 /*ellipsize width*/)) / 1.5f
 
             subject.grades1.onEach { grade ->
-                val gradeColor = when (App.config.forProfile().grades.colorMode) {
-                    COLOR_MODE_DEFAULT -> grade.color
-                    else -> Colors.gradeToColor(grade)
-                }
-
-                val gradeName = TextView(gradeItem.context).apply {
-                    text = when (grade.type) {
-                        TYPE_SEMESTER1_PROPOSED, TYPE_SEMESTER2_PROPOSED -> app.getString(R.string.grade_semester_proposed_format, grade.name)
-                        TYPE_SEMESTER1_FINAL, TYPE_SEMESTER2_FINAL -> app.getString(R.string.grade_semester_final_format, grade.name)
-                        TYPE_YEAR_PROPOSED -> app.getString(R.string.grade_year_proposed_format, grade.name)
-                        TYPE_YEAR_FINAL -> app.getString(R.string.grade_year_final_format, grade.name)
-                        else -> grade.name
-                    }
-
-                    setTextColor(when (ColorUtils.calculateLuminance(gradeColor) > 0.25) {
-                        true -> 0xff000000
-                        else -> 0xffffffff
-                    }.toInt())
-
-                    setTypeface(null, Typeface.BOLD)
-                    setBackgroundResource(R.drawable.bg_rounded_4dp)
-                    background.colorFilter = PorterDuffColorFilter(gradeColor, PorterDuff.Mode.MULTIPLY)
-                    setPadding(5.dp, 0, 5.dp, 0)
-
-                    measure(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-                }
+                val gradeName = GradeView(
+                        gradeItem.context,
+                        grade,
+                        app.gradesManager
+                )
 
                 totalWidth += gradeName.measuredWidth + 5.dp
 
diff --git a/app/src/main/res/layout/dialog_grade_details.xml b/app/src/main/res/layout/dialog_grade_details.xml
index 4f8f0dda..79365b1b 100644
--- a/app/src/main/res/layout/dialog_grade_details.xml
+++ b/app/src/main/res/layout/dialog_grade_details.xml
@@ -55,13 +55,12 @@
                     android:layout_width="72dp"
                     android:layout_height="72dp"
                     android:background="@drawable/bg_rounded_16dp"
-                    android:fontFamily="serif-monospace"
                     android:gravity="center"
                     android:padding="8dp"
                     android:text="@{grade.name}"
                     android:textIsSelectable="true"
                     android:textSize="36sp"
-                    android:textStyle="bold"
+                    app:autoSizeMinTextSize="18sp"
                     app:autoSizeMaxTextSize="56sp"
                     app:autoSizeTextType="uniform"
                     tools:background="#ff4caf50"
@@ -270,7 +269,7 @@
                     android:id="@+id/gradeHistoryList"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    tools:listitem="@layout/row_grades_list_item" />
+                    tools:listitem="@layout/grades_item_grade" />
 
             </androidx.core.widget.NestedScrollView>
 
diff --git a/app/src/main/res/layout/row_grades_editor_item.xml b/app/src/main/res/layout/row_grades_editor_item.xml
index d6b46610..0e78bbec 100644
--- a/app/src/main/res/layout/row_grades_editor_item.xml
+++ b/app/src/main/res/layout/row_grades_editor_item.xml
@@ -50,7 +50,8 @@
                 android:background="@drawable/bg_rounded_8dp"
                 android:gravity="center"
                 android:textSize="24sp"
-                app:autoSizeMaxTextSize="24sp"
+                app:autoSizeMinTextSize="14sp"
+                app:autoSizeMaxTextSize="32sp"
                 app:autoSizeTextType="uniform"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -98,4 +99,4 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </com.daimajia.swipe.SwipeLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/row_grades_list_item.xml b/app/src/main/res/layout/row_grades_list_item.xml
deleted file mode 100644
index 70e06b1d..00000000
--- a/app/src/main/res/layout/row_grades_list_item.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
-    android:orientation="horizontal"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp">
-
-    <TextView
-        android:id="@+id/gradesListName"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:background="@drawable/bg_rounded_8dp"
-        android:fontFamily="serif-monospace"
-        android:gravity="center"
-        android:padding="2dp"
-        android:textSize="24sp"
-        android:textStyle="bold"
-        app:autoSizeMaxTextSize="32sp"
-        app:autoSizeTextType="uniform"
-        tools:background="#4caf50"
-        tools:text="NB" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/gradesListCategoryColumn"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:layout_weight="1"
-                android:ellipsize="end"
-                android:singleLine="true"
-                tools:text="kraje hehe no jak zwykle jedynka z geografii. to jest baaardzo długi tekst ale szkoda że się nie scrolluje." />
-
-            <TextView
-                android:id="@+id/gradesListAddedDate"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:textAppearance="@style/NavView.TextView.Helper"
-                tools:text="14.10.2015" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/gradesListWeight"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                android:textStyle="bold"
-                tools:text="waga 30"
-                tools:visibility="visible" />
-
-            <TextView
-                android:id="@+id/gradesListCategoryDescription"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:ellipsize="end"
-                android:maxWidth="200dp"
-                android:maxLines="1"
-                tools:text="Kartkówki - K1 123456789 12345678" />
-
-            <TextView
-                android:id="@+id/gradesListTeacher"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:layout_weight="1"
-                android:ellipsize="end"
-                android:gravity="end"
-                android:maxLines="1"
-                android:textAppearance="@style/NavView.TextView.Helper"
-                tools:text="Anna Jakaśtam-Cośtam" />
-        </LinearLayout>
-    </LinearLayout>
-</LinearLayout>
diff --git a/app/src/main/res/layout/row_grades_subject_item.xml b/app/src/main/res/layout/row_grades_subject_item.xml
deleted file mode 100644
index 2b31eb50..00000000
--- a/app/src/main/res/layout/row_grades_subject_item.xml
+++ /dev/null
@@ -1,459 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/gradesSubjectRoot"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:attr/selectableItemBackground"
-    android:clickable="true"
-    android:focusable="true"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp">
-
-    <TextView
-        android:id="@+id/gradesSubjectTitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:text="@string/loading"
-        android:textAppearance="@style/NavView.TextView.Title"
-        app:layout_constraintEnd_toStartOf="@+id/gradesSubjectExpandIndicator"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="{SUBJECT_NAME}" />
-
-    <LinearLayout
-        android:id="@+id/gradesSubjectPreviewContainer"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:orientation="horizontal"
-        tools:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/gradesSubjectTitle">
-
-        <TextView
-            android:id="@+id/gradesSubjectPreviewSemester"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="5dp"
-            android:layout_marginRight="5dp"
-            android:textStyle="italic"
-            android:visibility="gone"
-            tools:text="Semestr 1"
-            tools:visibility="visible" />
-
-        <LinearLayout
-            android:id="@+id/gradesSubjectPreviewContent"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="horizontal">
-
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/gradesSubjectPreviewAverage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            tools:text="4.70" />
-
-        <TextView
-            android:id="@+id/gradesSubjectPreviewProposed"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="5dp"
-            android:layout_marginRight="5dp"
-            android:background="@drawable/bg_rounded_4dp_outline"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:textColor="@android:color/white"
-            android:textStyle="bold"
-            android:visibility="gone"
-            tools:text="4"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/gradesSubjectPreviewFinal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="5dp"
-            android:layout_marginRight="5dp"
-            android:background="@drawable/bg_rounded_4dp"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:textColor="@color/black"
-            android:textStyle="bold"
-            android:visibility="gone"
-            tools:text="5"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/gradesSubjectPreviewYearAverage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="5dp"
-            android:visibility="gone"
-            tools:visibility="visible"
-            tools:text="4.70"
-            android:layout_marginEnd="5dp" />
-
-        <TextView
-            android:id="@+id/gradesSubjectPreviewYearProposed"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="5dp"
-            android:layout_marginRight="5dp"
-            android:background="@drawable/bg_rounded_4dp_outline"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:textColor="@android:color/white"
-            android:textStyle="bold"
-            android:visibility="gone"
-            tools:text="4"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/gradesSubjectPreviewYearFinal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="5dp"
-            android:layout_marginRight="5dp"
-            android:background="@drawable/bg_rounded_4dp"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:textColor="@color/black"
-            android:textStyle="bold"
-            android:visibility="gone"
-            tools:text="5"
-            tools:visibility="visible" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/gradesSubjectContent"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:orientation="vertical"
-        android:visibility="gone"
-        tools:visibility="visible"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/gradesSubjectTitle">
-
-
-        <LinearLayout
-            android:id="@+id/gradesSubjectSemester2Header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?android:attr/selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            android:orientation="horizontal">
-
-            <com.mikepenz.iconics.view.IconicsImageView
-                android:id="@+id/gradesSubjectSemester2ExpandIndicator"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                android:padding="8dp"
-                app:iiv_color="?android:textColorSecondary"
-                app:iiv_icon="cmd-menu-down"
-                tools:srcCompat="@tools:sample/avatars" />
-
-            <TextView
-                android:id="@+id/gradesSubjectSemester2Title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_weight="1"
-                android:ellipsize="start"
-                android:singleLine="true"
-                android:textAppearance="@style/NavView.TextView.Medium"
-                android:text="@string/grades_semester2_header" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:gravity="end"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/gradesSubjectYearAverage"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="5dp"
-                        android:layout_marginRight="5dp"
-                        android:layout_weight="1"
-                        tools:text="koniec roku: 4.70" />
-
-                    <TextView
-                        android:id="@+id/gradesSubjectYearProposed"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="5dp"
-                        android:layout_marginRight="5dp"
-                        android:background="@drawable/bg_rounded_4dp_outline"
-                        android:paddingLeft="5dp"
-                        android:paddingRight="5dp"
-                        android:textColor="@android:color/white"
-                        android:textStyle="bold"
-                        tools:text="4" />
-
-                    <TextView
-                        android:id="@+id/gradesSubjectYearFinal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="5dp"
-                        android:layout_marginRight="5dp"
-                        android:background="@drawable/bg_rounded_4dp"
-                        android:paddingLeft="5dp"
-                        android:paddingRight="5dp"
-                        android:textColor="@color/black"
-                        android:textStyle="bold"
-                        tools:text="5" />
-                </LinearLayout>
-
-                <Space
-                    android:layout_width="match_parent"
-                    android:layout_height="5dp" />
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/gradesSubjectSemester2Average"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="5dp"
-                        android:layout_marginRight="5dp"
-                        android:layout_weight="1"
-                        tools:text="semestr 2: 5.00" />
-
-                    <TextView
-                        android:id="@+id/gradesSubjectSemester2Proposed"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="5dp"
-                        android:layout_marginRight="5dp"
-                        android:background="@drawable/bg_rounded_4dp_outline"
-                        android:paddingLeft="5dp"
-                        android:paddingRight="5dp"
-                        android:textColor="@android:color/white"
-                        android:textStyle="bold"
-                        tools:text="5" />
-
-                    <TextView
-                        android:id="@+id/gradesSubjectSemester2Final"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="5dp"
-                        android:layout_marginRight="5dp"
-                        android:background="@drawable/bg_rounded_4dp"
-                        android:paddingLeft="5dp"
-                        android:paddingRight="5dp"
-                        android:textColor="@color/black"
-                        android:textStyle="bold"
-                        tools:text="5" />
-                </LinearLayout>
-
-            </LinearLayout>
-
-            <com.mikepenz.iconics.view.IconicsImageView
-                android:id="@+id/gradesSubjectSemester2EditButton"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_gravity="center_vertical"
-                android:background="?selectableItemBackground"
-                android:padding="8dp"
-                app:iiv_color="?android:textColorSecondary"
-                app:iiv_icon="cmd-pencil"
-                tools:srcCompat="@tools:sample/avatars" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/gradesSubjectSemester2Container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="visible">
-
-            <androidx.core.widget.NestedScrollView
-                android:id="@+id/gradesSubjectSemester2Nest"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/gradesSubjectSemester2Content"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    tools:itemCount="3"
-                    tools:listitem="@layout/row_grades_list_item" />
-
-            </androidx.core.widget.NestedScrollView>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/gradesSubjectSemester1Header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?android:attr/selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            android:orientation="horizontal">
-
-            <com.mikepenz.iconics.view.IconicsImageView
-                android:id="@+id/gradesSubjectSemester1ExpandIndicator"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                android:padding="8dp"
-                app:iiv_color="?android:textColorSecondary"
-                app:iiv_icon="cmd-menu-down"
-                tools:srcCompat="@tools:sample/avatars" />
-
-            <TextView
-                android:id="@+id/gradesSubjectSemester1Title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_weight="1"
-                android:ellipsize="start"
-                android:singleLine="true"
-                android:textAppearance="@style/NavView.TextView.Medium"
-                android:text="@string/grades_semester1_header"/>
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:gravity="end"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/gradesSubjectSemester1Average"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="5dp"
-                        android:layout_marginRight="5dp"
-                        android:layout_weight="1"
-                        tools:text="semestr 1: 0.63" />
-
-                    <TextView
-                        android:id="@+id/gradesSubjectSemester1Proposed"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="5dp"
-                        android:layout_marginRight="5dp"
-                        android:background="@drawable/bg_rounded_4dp_outline"
-                        android:paddingLeft="5dp"
-                        android:paddingRight="5dp"
-                        android:textColor="@android:color/white"
-                        android:textStyle="bold"
-                        tools:text="1" />
-
-                    <TextView
-                        android:id="@+id/gradesSubjectSemester1Final"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="5dp"
-                        android:layout_marginRight="5dp"
-                        android:background="@drawable/bg_rounded_4dp"
-                        android:paddingLeft="5dp"
-                        android:paddingRight="5dp"
-                        android:textColor="@color/black"
-                        android:textStyle="bold"
-                        tools:text="2" />
-                </LinearLayout>
-
-            </LinearLayout>
-
-            <com.mikepenz.iconics.view.IconicsImageView
-                android:id="@+id/gradesSubjectSemester1EditButton"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_gravity="center_vertical"
-                android:background="?selectableItemBackground"
-                android:padding="8dp"
-                app:iiv_color="?android:textColorSecondary"
-                app:iiv_icon="cmd-pencil"
-                tools:srcCompat="@tools:sample/avatars" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/gradesSubjectSemester1Container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone"
-            tools:visibility="visible">
-
-            <androidx.core.widget.NestedScrollView
-                android:id="@+id/gradesSubjectSemester1Nest"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/gradesSubjectSemester1Content"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    tools:itemCount="5"
-                    tools:listitem="@layout/row_grades_list_item" />
-
-            </androidx.core.widget.NestedScrollView>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <com.mikepenz.iconics.view.IconicsImageView
-        android:id="@+id/gradesSubjectExpandIndicator"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:padding="8dp"
-        app:iiv_color="?android:textColorSecondary"
-        app:iiv_icon="cmd-menu-down"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:srcCompat="@tools:sample/avatars[0]" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file