Version 0.6.2

app/build.gradle

@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 20
-        versionName "0.6.1"
+        versionCode 21
+        versionName "0.6.2"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -77,20 +77,16 @@ play {
     uploadImages = false
 }
 
-configurations.all {
-    resolutionStrategy.force "com.squareup.okhttp3:okhttp-urlconnection:3.11.0"
-}
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    implementation('io.github.wulkanowy:api:0.6.0') { exclude module: "threetenbp" }
+    implementation('io.github.wulkanowy:api:0.6.2') { exclude module: "threetenbp" }
 
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.appcompat:appcompat:1.0.2"
     implementation "androidx.cardview:cardview:1.0.0"
     implementation "com.google.android.material:material:1.0.0"
-    implementation 'androidx.multidex:multidex:2.0.0'
+    implementation 'androidx.multidex:multidex:2.0.1'
 
     implementation 'com.takisoft.preferencex:preferencex:1.0.0'
     implementation "com.mikepenz:aboutlibraries:6.2.0"
@@ -120,7 +116,7 @@ dependencies {
     implementation "at.favre.lib:slf4j-timber:1.0.1"
 
     implementation 'com.google.firebase:firebase-core:16.0.6'
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.7'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.8'
 
     debugImplementation "com.amitshekhar.android:debug-db:1.0.4"
 

app/src/debug/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,58 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="1926.9231"
+        android:viewportHeight="1926.9231">
+    <group android:translateX="462.46155"
+            android:translateY="462.46155">
+      <path
+          android:pathData="M2000,1440.1V2002H1240.1L238.1,1000v0l-120,-120c0.2,-0.2 -0.7,-1.6 -0.6,-1.8 1.6,-3.1 3.4,-6 5,-9.1 0.4,-0.8 0.6,-1.6 0.6,-2.5 9.2,-15.1 20.2,-28.9 31.4,-42.6 0.1,-0.2 0.3,-0.3 0.4,-0.5 5.1,-6.3 10.3,-12.6 15.3,-18.9 1,-1.2 1.9,-2.4 2.9,-3.7 0.2,-0.2 0.3,-0.4 0.5,-0.6 7.6,-9.7 14.8,-19.7 21.2,-30.2 1,-1.7 2,-3.4 2.9,-5.1 0.1,-0.2 0.2,-0.3 0.3,-0.5 6.2,-11.4 11.3,-23.3 17.7,-34.6 4.5,-8 9.3,-15.9 13.8,-23.9 0.1,-0.2 0.2,-0.3 0.3,-0.5 0.8,-1.5 1.6,-3 2.4,-4.4 0.2,-0.3 0.3,-0.6 0.5,-0.9 2,-3.7 3.8,-7.4 5.6,-11.2 6.2,-13.4 10.2,-27.7 14,-41.9 0,-0.2 0.1,-0.3 0.1,-0.5 0.3,-1 0.5,-2 0.8,-2.9 4,-15.3 7.3,-31.4 13.5,-45.9 1.4,-3.3 3,-6.5 4.6,-9.6 0.1,-0.2 0.2,-0.3 0.3,-0.5 5,-9.7 10.6,-19.1 13.5,-29.7 2.6,-9.2 3.5,-19 3.6,-28.8 0,-0.2 0,-0.3 0,-0.5 0.1,-7.2 -0.1,-14.4 -0.4,-21.3 0.9,-5.6 1.9,-11.3 3,-16.9 0.2,-0.9 0.3,-1.7 0.5,-2.6 1.2,-5.9 2.5,-11.7 4.2,-17.4 0,-0.1 0.1,-0.3 0.1,-0.4 0,-0.2 0.1,-0.3 0.1,-0.5 0.2,-2.1 -0.8,-3.7 -2.4,-4.5l7.7,-7.6c1.2,0.9 2.7,1.3 4.3,0.9 12.8,-3.9 24.9,-9.9 36.3,-16.8 2.8,-1.7 5.6,-3.4 8.3,-5.2 0.2,-0.1 0.3,-0.2 0.5,-0.3 7.7,-4.9 15.2,-10.2 22.1,-16 3.1,-2.7 5.9,-5.6 8.3,-8.9 0.1,-0.2 0.2,-0.3 0.4,-0.5 2.3,-3.4 4.2,-7.2 5.3,-11.4 2.4,-9.2 1.9,-19 1.9,-28.4 0,-0.2 0,-0.4 0,-0.6l5.7,-5.6 -0.3,0.1 4.1,1.3 45.3,45 9.6,9.6 14.3,14.3 100.8,100.8 17.2,17.2 16.3,16.3 30.3,-30.3 -192.9,-191.5c0.5,-0.5 1.1,-1.6 1.4,-2.3 0.3,-0.6 0.5,-1.2 0.4,-1.9 0,-0.8 -0.2,-1.6 -0.6,-2.3 -0.1,-0.3 -0.3,-0.7 -0.4,-1 -0.2,-0.4 -0.5,-0.7 -0.9,-1.1l27.8,-27.8 191.1,-191.1c0.7,0.4 1.5,0.6 2.5,0.7 4.1,0 8.2,0.1 11.9,1.9 0.5,0.3 1.3,0.7 2.1,1.1 1.7,2.3 3.5,4.5 5.7,6.2 2.7,2.1 8.2,3 9.4,0.3z"
+          android:fillColor="#AD2A2A"/>
+      <path
+          android:pathData="m616.3,796.7c0.4,1.2 0.5,2.4 0.5,3.7l-5.8,73.3c-0.4,5.2 -5,9.3 -10.6,9.3h-187.2c-4,0 -7.7,-2.3 -9.5,-5.6l-30.9,-57.4c-0.2,-0.3 -0.3,-0.6 -0.4,-0.9l-29.1,-70.5c-1.1,-2.5 -0.9,-5.4 0.3,-7.8l48.3,-94.5c1.2,-2.3 1.4,-5 0.5,-7.4l-23.6,-65.4c-0.8,-2.3 -0.7,-4.9 0.3,-7.1l39.4,-83.9c4,-8.4 17.1,-7.7 19.9,1.1l12.3,38.2 37.5,100.4c1,2.8 3.4,5 6.4,6l80,27.3c3.1,1.1 5.5,3.4 6.5,6.3z"
+          android:fillColor="#FFFFFF"/>
+      <path
+          android:pathData="m386.7,253.5c0,-22.9 14.5,-42.6 35.3,-51.8 -1.5,-2.5 -2.4,-5.2 -2.4,-8.1 0,-11.1 12.8,-20.1 28.5,-20.1 0.4,0 0.7,0 1.1,0 6.5,-10.8 18.9,-18.1 33.1,-18.1 1,0 2,0 3,0.1 1.3,0.1 2.6,-0.5 3.3,-1.5 10.5,-16 37.1,-27.4 68.2,-27.4 11.5,0 22.4,1.6 32.1,4.3 2.3,-3.8 7.4,-6.4 13.3,-6.4 6.7,0 12.4,3.4 14.1,8.1 8.2,-9.5 22.1,-15.7 37.9,-15.7 25.2,0 45.6,15.9 45.6,35.5 0,2.4 -0.3,4.7 -0.9,7 -0.4,1.6 0.5,3.2 2.2,3.8 16.1,5.9 27,17.1 27,29.9 0,14.6 -14.1,27.1 -34,32 -1.6,0.4 -2.6,1.8 -2.6,3.3 0,0.1 0,0.2 0,0.3 0,11.3 -11.2,20.6 -25.6,21.6 0.1,0.5 0.1,1 0.1,1.6 0,21.7 -41.3,39.2 -92.2,39.2 -11,0 -21.5,-0.8 -31.2,-2.3 0,0.2 0,0.3 0,0.5 0,9 -11.6,16.3 -25.8,16.3 -0.8,0 -1.5,0 -2.2,-0.1 1,2.2 1.5,4.5 1.5,6.9 0,14 -17.7,25.3 -39.6,25.3 -2.4,0 -4.7,-0.1 -7,-0.4 -1.8,-0.2 -3.5,0.9 -3.9,2.6 -1.9,7 -8,12.1 -15.3,12.1 -8.8,0 -15.8,-7.5 -15.8,-16.7 0,-4.3 1.5,-8.2 4,-11.1 0.9,-1 1.2,-2.4 0.6,-3.6 -1.4,-2.6 -2,-5.3 -2,-8.2v0c0,-1.6 -1.3,-2.9 -2.9,-3.3 -27.1,-6 -47.5,-28.6 -47.5,-55.6z"
+          android:fillColor="#FFFFFF"/>
+      <path
+          android:pathData="m870.4,883h-124.4c-3.6,0 -6.9,-1.8 -8.9,-4.6l-83.7,-117.7c-0.5,-0.8 -1,-1.6 -1.3,-2.5l-41.5,-121.2c-0.8,-2.4 -2.7,-4.5 -5.1,-5.7l-101.6,-51.3c-2.8,-1.4 -4.8,-4 -5.4,-6.9l-15,-74.4c-0.2,-1.2 -0.7,-2.4 -1.5,-3.5l-34.5,-50.7c-1.9,-2.8 -2.2,-6.2 -0.8,-9.2l21,-44.9c1.6,-3.4 5.1,-5.7 9.1,-5.9l39,-2.3c2.3,-0.1 4.4,-0.9 6.1,-2.3l28.7,-22.3c5.4,-4.2 13.6,-2.4 16.5,3.5l98.9,201.2c0.4,0.9 0.7,1.8 0.9,2.7l12.2,80.9c0.3,1.9 1.1,3.6 2.4,5l197,215.6c5.8,6.4 0.9,16.5 -8.1,16.5z"
+          android:fillColor="#FFFFFF"/>
+      <path
+          android:pathData="m335.8,838.9c0.8,2.6 0.4,5.4 -1,7.7l-19.3,31.3c-1.9,3.1 -5.4,5.1 -9.2,5.1h-180.6c-8.4,0 -13.5,-8.8 -9,-15.4l116.3,-171.3c0.7,-1 1.1,-2.1 1.4,-3.2l53.3,-227.6c0.6,-2.7 2.4,-5 5,-6.4l72.2,-39.6c2.6,-1.4 4.4,-3.7 5,-6.5l9.7,-42.3c2,-8.8 14.6,-10.7 19.6,-3l3.5,5.6c1.5,2.4 1.9,5.4 0.9,8.1l-65.8,190.2c-0.5,1.5 -0.7,3.1 -0.4,4.7l16.4,91c0.3,1.8 0.1,3.7 -0.7,5.4l-39.1,87.8c-0.9,2.1 -1.1,4.4 -0.4,6.5z"
+          android:fillColor="#FFFFFF"/>
+      <path
+          android:pathData="m424.22,657.05 l1580.54,-0.05c0.54,0 0,292 0,292l-1580.54,-0.03c-10.78,0 -19.46,-8.68 -19.46,-19.46l0,-252.99c0,-10.78 8.68,-19.46 19.46,-19.46z"
+          android:strokeAlpha="0.49803922"
+          android:strokeLineJoin="round"
+          android:strokeWidth="4"
+          android:fillColor="#3f3f3f"
+          android:strokeColor="#00000000"
+          android:fillType="nonZero"
+          android:fillAlpha="1"
+          android:strokeLineCap="square"/>
+      <path
+          android:pathData="m728.71,710.91l0,19.89l-88.7,0l0,59.3l77.04,0L717.05,810l-77.04,0l0,65.39l89.84,0l0,19.9L616.56,895.29L616.56,791.16l-52.35,-52.35 -0.77,-0.18c5.41,6.64 9.65,14.32 12.69,23.09 3.72,10.39 5.62,21.92 5.7,34.6L581.84,809.87c-0.08,12.67 -1.98,24.25 -5.7,34.72 -3.63,10.39 -8.95,19.35 -15.97,26.87 -6.93,7.43 -15.46,13.26 -25.6,17.49 -7.54,3.1 -15.86,5.07 -24.97,5.89 -3.04,0.27 -6.16,0.42 -9.37,0.45L457.53,895.29l0,-6.55l-0.37,6.82 53.8,53.45l415.85,0c0.24,0 0.47,-0.02 0.69,-0.05L1132.91,948.97L953.5,769.55l-58.39,-58.39 -0.28,0.06 -58.03,184.06l-20.4,0l-44.66,-141.34zM783.29,711.07 L826.41,857.52 850.08,777.86zM509.6,711.29c1.52,0.15 3.01,0.33 4.49,0.54 -1.47,-0.21 -2.97,-0.39 -4.49,-0.54zM481.35,730.04l0,146.11l18.88,0c9.97,-0.08 18.59,-1.81 25.85,-5.19 7.27,-3.46 13.26,-8.15 17.99,-14.07 4.82,-5.91 8.36,-12.88 10.64,-20.91 2.37,-8.03 3.59,-16.73 3.68,-26.11l0,-13.81c-0.08,-9.38 -1.31,-18.04 -3.68,-25.98 -2.37,-8.03 -5.91,-14.95 -10.64,-20.78 -4.73,-5.91 -10.73,-10.56 -17.99,-13.94 -7.27,-3.38 -15.88,-5.15 -25.85,-5.32zM560.17,734.86c0.65,0.69 1.26,1.4 1.88,2.11 -0.61,-0.72 -1.23,-1.42 -1.88,-2.11z"
+          android:strokeAlpha="1"
+          android:strokeLineJoin="miter"
+          android:strokeWidth="1.94642854"
+          android:fillColor="#000000"
+          android:strokeColor="#00000000"
+          android:fillAlpha="0.18431373"
+          android:strokeLineCap="butt"/>
+      <path
+          android:pathData="m457.53,895.28l0,-184.51l42.7,0q19.26,0.25 34.34,6.59 15.21,6.21 25.6,17.49 10.52,11.15 15.97,26.86 5.58,15.59 5.7,34.59l0,13.56q-0.13,19.01 -5.7,34.72 -5.45,15.59 -15.97,26.86 -10.39,11.15 -25.6,17.49 -15.08,6.21 -34.34,6.34zM481.35,730.04l0,146.11l18.88,0q14.95,-0.13 25.85,-5.2 10.9,-5.2 17.99,-14.07 7.22,-8.87 10.64,-20.91 3.55,-12.04 3.67,-26.1l0,-13.81q-0.13,-14.07 -3.67,-25.98 -3.55,-12.04 -10.64,-20.78 -7.1,-8.87 -17.99,-13.94 -10.9,-5.07 -25.85,-5.32z"
+          android:fillColor="#ffffff"
+          android:strokeColor="#00000000"
+          android:fillAlpha="1"/>
+      <path
+          android:pathData="M717.05,810L640.01,810l0,65.39l89.84,0l0,19.9l-113.29,0l0,-184.51l112.15,0l0,20.02L640.01,730.8l0,59.31l77.05,0z"
+          android:fillColor="#ffffff"
+          android:strokeColor="#00000000"
+          android:fillAlpha="1"/>
+      <path
+          android:pathData="m826.41,857.52 l43.59,-146.74l24.96,0l-58.16,184.51L816.4,895.28l-58.29,-184.51l25.09,0z"
+          android:fillColor="#ffffff"
+          android:strokeColor="#00000000"
+          android:fillAlpha="1"/>
+    </group>
+</vector>

app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/debug/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#D32F2F</color>
+</resources>

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() {

app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt

@@ -103,7 +103,7 @@ class GradeDetailsFragment : BaseSessionFragment(), GradeDetailsView, GradeView.
     }
 
     override fun scrollToStart() {
-        gradeDetailsAdapter.smoothScrollToPosition(0)
+        gradeDetailsRecycler.scrollToPosition(0)
     }
 
     override fun getHeaderOfItem(item: AbstractFlexibleItem<*>): IExpandable<*, out IFlexible<*>>? {

app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt

@@ -97,6 +97,7 @@ class GradeDetailsPresenter @Inject constructor(
         disposable.add(studentRepository.getCurrentStudent()
             .flatMap { semesterRepository.getSemesters(it) }
             .flatMap { gradeRepository.getGrades(it.first { item -> item.semesterId == semesterId }, forceRefresh) }
+            .map { it.sortedByDescending { grade -> grade.date } }
             .map { it.map { item -> item.changeModifier(preferencesRepository.gradePlusModifier, preferencesRepository.gradeMinusModifier) } }
             .map { createGradeItems(it.groupBy { grade -> grade.subject }.toSortedMap()) }
             .subscribeOn(schedulers.backgroundThread)

app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt

@@ -71,7 +71,7 @@ class GradeSummaryFragment : BaseSessionFragment(), GradeSummaryView, GradeView.
     }
 
     override fun resetView() {
-        gradeSummaryAdapter.smoothScrollToPosition(0)
+        gradeSummaryRecycler.scrollToPosition(0)
     }
 
     override fun showContent(show: Boolean) {

app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryHeader.kt

@@ -1,52 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade.summary
-
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractHeaderItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.header_grade_summary.*
-
-class GradeSummaryHeader(private val name: String, private val average: String) : AbstractHeaderItem<GradeSummaryHeader.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.header_grade_summary
-
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder?,
-                                position: Int, payloads: MutableList<Any>?) {
-        holder?.run {
-            gradeSummaryHeaderName.text = name
-            gradeSummaryHeaderAverage.text = average
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as GradeSummaryHeader
-
-        if (name != other.name) return false
-        if (average != other.average) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = name.hashCode()
-        result = 31 * result + average.hashCode()
-        return result
-    }
-
-    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) :
-            FlexibleViewHolder(view, adapter), LayoutContainer {
-
-        override val containerView: View?
-            get() = contentView
-    }
-}

app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt

@@ -2,16 +2,19 @@ package io.github.wulkanowy.ui.modules.grade.summary
 
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractSectionableItem
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.davidea.viewholders.FlexibleViewHolder
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.GradeSummary
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.item_grade_summary.*
 
-class GradeSummaryItem(header: GradeSummaryHeader, private val grade: String, private val title: String) :
-    AbstractSectionableItem<GradeSummaryItem.ViewHolder, GradeSummaryHeader>(header) {
+class GradeSummaryItem(
+    private val title: String,
+    private val average: String,
+    private val predictedGrade: String,
+    private val finalGrade: String
+) : AbstractFlexibleItem<GradeSummaryItem.ViewHolder>() {
 
     override fun getLayoutRes() = R.layout.item_grade_summary
 
@@ -24,8 +27,10 @@ class GradeSummaryItem(header: GradeSummaryHeader, private val grade: String, pr
         position: Int, payloads: MutableList<Any>?
     ) {
         holder?.run {
-            gradeSummaryItemGrade.text = grade
             gradeSummaryItemTitle.text = title
+            gradeSummaryItemAverage.text = average
+            gradeSummaryItemPredicted.text = predictedGrade
+            gradeSummaryItemFinal.text = finalGrade
         }
     }
 
@@ -35,17 +40,19 @@ class GradeSummaryItem(header: GradeSummaryHeader, private val grade: String, pr
 
         other as GradeSummaryItem
 
-        if (grade != other.grade) return false
+        if (average != other.average) return false
         if (title != other.title) return false
-        if (header != other.header) return false
+        if (predictedGrade != other.predictedGrade) return false
+        if (finalGrade != other.finalGrade) return false
 
         return true
     }
 
     override fun hashCode(): Int {
-        var result = header.hashCode()
-        result = 31 * result + grade.hashCode()
-        result = 31 * result + title.hashCode()
+        var result = title.hashCode()
+        result = 31 * result + average.hashCode()
+        result = 31 * result + predictedGrade.hashCode()
+        result = 31 * result + finalGrade.hashCode()
         return result
     }
 

app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt

@@ -99,23 +99,14 @@ class GradeSummaryPresenter @Inject constructor(
 
     private fun createGradeSummaryItems(gradesSummary: List<GradeSummary>, averages: Map<String, Double>)
         : List<GradeSummaryItem> {
-        return gradesSummary.filter { !checkEmpty(it, averages) }
-            .flatMap { gradeSummary ->
-                GradeSummaryHeader(
-                    name = gradeSummary.subject,
-                    average = formatAverage(averages.getOrElse(gradeSummary.subject) { 0.0 }, "")
-                ).let {
-                    listOf(GradeSummaryItem(
-                        header = it,
-                        title = view?.predictedString.orEmpty(),
-                        grade = gradeSummary.predictedGrade
-                    ), GradeSummaryItem(
-                        header = it,
-                        title = view?.finalString.orEmpty(),
-                        grade = gradeSummary.finalGrade
-                    ))
-                }
-            }
+        return gradesSummary.filter { !checkEmpty(it, averages) }.map { it ->
+            GradeSummaryItem(
+                title = it.subject,
+                average = formatAverage(averages.getOrElse(it.subject) { 0.0 }, ""),
+                predictedGrade = it.predictedGrade,
+                finalGrade = it.finalGrade
+            )
+        }
     }
 
     private fun checkEmpty(gradeSummary: GradeSummary, averages: Map<String, Double>): Boolean {

app/src/main/play/pl-PL/whatsnew

@@ -1,16 +1,10 @@
-Wersja 0.6.0
+Wersja 0.6.2
 
-Aplikacja została całkowicie przepisana!
-Przez wielkie zmian, które w niej zaszły, wymagane jest ponowne logowanie w aplikacji
-oraz ponowne dodanie widgetu planu lekcji do ekranu głównego.
+- zmieniono ikonę podsumowania frekwencji
+- naprawiono niepokazującą się strzałkę przy przedmiotach w podsumowaniu frekwencji
+- naprawiono sortowanie ocen
+- naprawiono zepsuty widok podsumowania frekwencji
+- naprawiono przeglądanie skrzynki nadawczej na kontach opiekunów
+- naprawiono logowanie w systemach Resman Rzeszów i podobnych
 
-Mamy nową ikonę aplikacji! 🎉
-
-Dodaliśmy nowe funkcje:
-- przeglądanie wiadomości (wysyłanie pojawi się w przyszłości)
-- zadania domowe
-- statystyki frekwencji
-- menadżer kont
-- możliwość zmiany wagi plusów i minusów
-
-Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases/tag/0.6.0
+Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases/tag/0.6.2

app/src/main/res/drawable/ic_menu_main_attendance_summary_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,17L7,17v-7h2v7zM13,17h-2L11,7h2v10zM17,17h-2v-4h2v4z"/>
+</vector>

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">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <androidx.appcompat.widget.AppCompatSpinner
-            android:id="@+id/attendanceSummarySubjects"
+        <LinearLayout
+            android:id="@+id/attendanceSummarySubjectsContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="invisible"
             android:background="?android:attr/windowBackground"
             android:elevation="5dp"
-            android:padding="15dp"
-            android:spinnerMode="dialog" />
+            android:padding="5dp"
+            android:visibility="invisible"
+            tools:listitem="@layout/item_attendance_summary"
+            tools:targetApi="lollipop"
+            tools:visibility="visible">
+
+            <androidx.appcompat.widget.AppCompatSpinner
+                android:id="@+id/attendanceSummarySubjects"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="middle"
+                android:entries="@array/endpoints_keys"
+                android:paddingStart="10dp"
+                android:paddingLeft="10dp"
+                android:paddingTop="10dp"
+                android:paddingEnd="30dp"
+                android:paddingRight="30dp"
+                android:paddingBottom="10dp"
+                android:spinnerMode="dialog" />
+        </LinearLayout>
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/attendanceSummarySwipe"
@@ -27,7 +45,8 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/attendanceSummaryRecycler"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                tools:listitem="@layout/item_attendance_summary" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     </LinearLayout>
 

app/src/main/res/layout/header_grade_summary.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?colorControlHighlight"
-    android:orientation="horizontal"
-    android:paddingLeft="20dp"
-    android:paddingTop="7dp"
-    android:paddingRight="20dp"
-    android:paddingBottom="7dp">
-
-    <TextView
-        android:id="@+id/gradeSummaryHeaderName"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="40dp"
-        android:layout_marginRight="40dp"
-        android:layout_weight="1"
-        android:text="@string/app_name"
-        android:textSize="17sp" />
-
-    <TextView
-        android:id="@+id/gradeSummaryHeaderAverage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="end"
-        android:text="@string/app_name"
-        android:textSize="12sp" />
-
-</LinearLayout>

app/src/main/res/layout/item_attendance_summary.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
@@ -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" />
 
         <TextView
             android:id="@+id/attendanceSummaryPercentage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="end"
-            android:text="@string/app_name"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:text="75%" />
     </LinearLayout>
 
     <LinearLayout
@@ -60,8 +61,8 @@
             android:layout_marginEnd="25dp"
             android:layout_marginRight="25dp"
             android:gravity="end"
-            android:text="@string/app_name"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:text="50" />
     </LinearLayout>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -91,8 +92,8 @@
             android:layout_marginEnd="25dp"
             android:layout_marginRight="25dp"
             android:gravity="end"
-            android:text="@string/app_name"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:text="0" />
     </LinearLayout>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -122,8 +123,8 @@
             android:layout_marginEnd="25dp"
             android:layout_marginRight="25dp"
             android:gravity="end"
-            android:text="@string/app_name"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:text="25" />
     </LinearLayout>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -153,8 +154,8 @@
             android:layout_marginEnd="25dp"
             android:layout_marginRight="25dp"
             android:gravity="end"
-            android:text="@string/app_name"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:text="0" />
     </LinearLayout>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -184,8 +185,8 @@
             android:layout_marginEnd="25dp"
             android:layout_marginRight="25dp"
             android:gravity="end"
-            android:text="@string/app_name"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:text="6" />
     </LinearLayout>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -215,8 +216,8 @@
             android:layout_marginEnd="25dp"
             android:layout_marginRight="25dp"
             android:gravity="end"
-            android:text="@string/app_name"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:text="0" />
     </LinearLayout>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -246,7 +247,7 @@
             android:layout_marginEnd="25dp"
             android:layout_marginRight="25dp"
             android:gravity="end"
-            android:text="@string/app_name"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:text="0" />
     </LinearLayout>
 </LinearLayout>

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" />

app/src/main/res/layout/item_grade_summary.xml

@@ -1,31 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/ic_all_divider"
-    android:minHeight="35dp"
-    android:orientation="horizontal">
+    android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/gradeSummaryItemTitle"
-        android:layout_width="0dp"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="20dp"
-        android:layout_marginLeft="20dp"
-        android:layout_weight="1"
-        android:text="@string/grade_summary_predicted_grade"
-        android:textSize="14sp" />
+        android:background="?colorControlHighlight"
+        android:orientation="horizontal"
+        android:paddingLeft="20dp"
+        android:paddingTop="7dp"
+        android:paddingRight="20dp"
+        android:paddingBottom="7dp">
 
-    <TextView
-        android:id="@+id/gradeSummaryItemGrade"
-        android:layout_width="wrap_content"
+        <TextView
+            android:id="@+id/gradeSummaryItemTitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="40dp"
+            android:layout_marginRight="40dp"
+            android:layout_weight="1"
+            android:textSize="17sp"
+            tools:text="@tools:sample/lorem" />
+
+        <TextView
+            android:id="@+id/gradeSummaryItemAverage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="end"
+            android:textSize="12sp"
+            tools:text="@string/aboutlibrary_lib_version" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginEnd="25dp"
-        android:layout_marginRight="25dp"
-        android:gravity="end"
-        android:text="@string/app_name"
-        android:textSize="12sp" />
+        android:background="@drawable/ic_all_divider"
+        android:minHeight="35dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
+            android:layout_weight="1"
+            android:text="@string/grade_summary_predicted_grade"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/gradeSummaryItemPredicted"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
+            android:gravity="end"
+            android:textSize="12sp"
+            tools:text="@string/aboutlibrary_lib_version" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/ic_all_divider"
+        android:minHeight="35dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
+            android:layout_weight="1"
+            android:text="@string/grade_summary_final_average"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/gradeSummaryItemFinal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
+            android:gravity="end"
+            android:textSize="12sp"
+            tools:text="@string/aboutlibrary_lib_version" />
+    </LinearLayout>
 </LinearLayout>

app/src/main/res/menu/action_menu_attendance.xml

@@ -3,8 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/attendanceMenuSummary"
-        android:icon="@drawable/ic_all_about_24dp"
+        android:icon="@drawable/ic_menu_main_attendance_summary_24dp"
         android:orderInCategory="1"
-        android:title="@string/grade_switch_semester"
+        android:title="@string/attendance_summary_button"
         app:showAsAction="ifRoom" />
 </menu>

app/src/main/res/values-pl/strings.xml

@@ -104,6 +104,7 @@
 
 
     <!--Attendance-->
+    <string name="attendance_summary_button">Podsumowanie frekwencji</string>
     <string name="attendance_absence_school">Nieobecny z przyczyn szkolnych</string>
     <string name="attendance_absence_excused">Nieobecność usprawiedliwiona</string>
     <string name="attendance_absence_unexcused">Nieobecność nieusprawiedliwiona</string>

app/src/main/res/values/strings.xml

@@ -91,10 +91,11 @@
     <string name="timetable_group">Group</string>
     <string name="timetable_time">Hours</string>
     <string name="timetable_changes">Changes</string>
-    <string name="timetable_no_items">No lesson in this day</string>
+    <string name="timetable_no_items">No lessons on this day</string>
 
 
     <!--Attendance-->
+    <string name="attendance_summary_button">Attendance summary</string>
     <string name="attendance_absence_school">Absent for school reasons</string>
     <string name="attendance_absence_excused">Excused absence</string>
     <string name="attendance_absence_unexcused">Unexcused absence</string>
@@ -192,7 +193,7 @@
 
 
     <!--Timetable Widget-->
-    <string name="widget_timetable_no_items">No lesson</string>
+    <string name="widget_timetable_no_items">No lessons</string>
     <string name="widget_timetable_today">Today</string>
     <string name="widget_timetable_tomorrow">Tomorrow</string>
 
@@ -214,7 +215,7 @@
     <string name="pref_services_switch">Automatic update</string>
     <string name="pref_services_suspended">Suspended on holiday</string>
     <string name="pref_services_interval">Updates interval</string>
-    <string name="pref_services_wifi">Only WiFi</string>
+    <string name="pref_services_wifi">Wi-Fi only</string>
 
 
     <!--Colors-->