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

Fix error view which overlaps grade statistics content (#627)

Browse Source
This commit is contained in:
Mikołaj Pich 2019-12-30 22:57:48 +01:00 committed by Rafał Borcz
parent 54f3733b56
commit 6be801d4a8
5 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -122,7 +122,7 @@ configurations.all {
} }
dependencies { dependencies {
implementation "io.github.wulkanowy:sdk:0.14.0" implementation "io.github.wulkanowy:sdk:069677aa2089b5678adbcae79dc253220995f172"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "androidx.core:core-ktx:1.2.0-rc01" implementation "androidx.core:core-ktx:1.2.0-rc01"

15
app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
View File

@ -47,6 +47,13 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
override val isBarViewEmpty get() = gradeStatisticsChartPoints.isEmpty override val isBarViewEmpty get() = gradeStatisticsChartPoints.isEmpty
override val currentType
get() = when (gradeStatisticsTypeSwitch.checkedRadioButtonId) {
R.id.gradeStatisticsTypeSemester -> ViewType.SEMESTER
R.id.gradeStatisticsTypePartial -> ViewType.PARTIAL
else -> ViewType.POINTS
}
private lateinit var gradeColors: List<Pair<Int, Int>> private lateinit var gradeColors: List<Pair<Int, Int>>
private val vulcanGradeColors = listOf( private val vulcanGradeColors = listOf(
@ -272,13 +279,7 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, checkedId -> gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, _ -> presenter.onTypeChange() }
presenter.onTypeChange(when (checkedId) {
R.id.gradeStatisticsTypeSemester -> ViewType.SEMESTER
R.id.gradeStatisticsTypePartial -> ViewType.PARTIAL
else -> ViewType.POINTS
})
}
} }
override fun onSaveInstanceState(outState: Bundle) { override fun onSaveInstanceState(outState: Bundle) {

5
app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
View File

@ -94,7 +94,8 @@ class GradeStatisticsPresenter @Inject constructor(
} }
} }
fun onTypeChange(type: ViewType) { fun onTypeChange() {
val type = view?.let { it.currentType } ?: ViewType.POINTS
Timber.i("Select grade stats semester: $type") Timber.i("Select grade stats semester: $type")
disposable.clear() disposable.clear()
view?.run { view?.run {
@ -214,7 +215,7 @@ class GradeStatisticsPresenter @Inject constructor(
private fun showErrorViewOnError(message: String, error: Throwable) { private fun showErrorViewOnError(message: String, error: Throwable) {
view?.run { view?.run {
if (isBarViewEmpty || isPieViewEmpty) { if ((isBarViewEmpty && currentType == ViewType.POINTS) || (isPieViewEmpty) && currentType != ViewType.POINTS) {
lastError = error lastError = error
setErrorDetails(message) setErrorDetails(message)
showErrorView(true) showErrorView(true)

2
app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt
View File

@ -10,6 +10,8 @@ interface GradeStatisticsView : BaseView {
val isBarViewEmpty: Boolean val isBarViewEmpty: Boolean
val currentType: ViewType
fun initView() fun initView()
fun updateSubjects(data: ArrayList<String>) fun updateSubjects(data: ArrayList<String>)

4
app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
View File

@ -57,6 +57,7 @@ class AttendanceRemoteTest {
subject = "Fizyka", subject = "Fizyka",
name = "Obecność", name = "Obecność",
date = date, date = date,
timeId = 0,
number = 0, number = 0,
deleted = false, deleted = false,
excusable = false, excusable = false,
@ -65,7 +66,8 @@ class AttendanceRemoteTest {
lateness = false, lateness = false,
presence = false, presence = false,
categoryId = 1, categoryId = 1,
absence = false absence = false,
excuseStatus = null
) )
} }
} }