diff --git a/app/src/main/kotlin/jackall/moncalc/viewmodel/FruitAnalyzeItemViewModel.kt b/app/src/main/kotlin/jackall/moncalc/viewmodel/FruitAnalyzeItemViewModel.kt index f5a8c94..1fd1fea 100644 --- a/app/src/main/kotlin/jackall/moncalc/viewmodel/FruitAnalyzeItemViewModel.kt +++ b/app/src/main/kotlin/jackall/moncalc/viewmodel/FruitAnalyzeItemViewModel.kt @@ -14,5 +14,5 @@ var grade4: String = "", var grade5: String = "" ) : ViewModel() { - fun isEmpty() = grade0.isBlank() and grade1.isBlank() and grade2.isBlank() and grade3.isBlank() and grade4.isBlank() and grade5.isBlank() + fun count() = grade0.toInt() + grade1.toInt() + grade2.toInt() + grade3.toInt() + grade4.toInt() + grade5.toInt() } \ No newline at end of file diff --git a/app/src/main/kotlin/jackall/moncalc/viewmodel/FruitAnalyzeViewModel.kt b/app/src/main/kotlin/jackall/moncalc/viewmodel/FruitAnalyzeViewModel.kt index 2f6ca24..04fad73 100644 --- a/app/src/main/kotlin/jackall/moncalc/viewmodel/FruitAnalyzeViewModel.kt +++ b/app/src/main/kotlin/jackall/moncalc/viewmodel/FruitAnalyzeViewModel.kt @@ -39,7 +39,7 @@ entries.add(PieEntry(count.toFloat(), monstDataRealmHelper.findNameById(Grade::class.java, fruitId))) } } - pieChartModel = PieChartModel(entries, "") + pieChartModel = PieChartModel(entries.apply { sortByDescending { it.value } }, "") this.pieData = pieChartModel.pieData val items = ArrayList() @@ -68,7 +68,7 @@ item.grade5 = questRealmHelper.countGrade(it.id, 5).toString() items.add(item) } - this.items = items + this.items = items.apply { sortByDescending { it.count() } } } object Adapter { diff --git a/app/src/main/kotlin/jackall/moncalc/viewmodel/TempleAnalyzeItemViewModel.kt b/app/src/main/kotlin/jackall/moncalc/viewmodel/TempleAnalyzeItemViewModel.kt index ff891d5..ca55c2e 100644 --- a/app/src/main/kotlin/jackall/moncalc/viewmodel/TempleAnalyzeItemViewModel.kt +++ b/app/src/main/kotlin/jackall/moncalc/viewmodel/TempleAnalyzeItemViewModel.kt @@ -10,4 +10,5 @@ val templeCount: String, val specialPercent: String ) : BaseObservable() { + fun count() = templeCount.toInt() } \ No newline at end of file diff --git a/app/src/main/kotlin/jackall/moncalc/viewmodel/TempleAnalyzeViewModel.kt b/app/src/main/kotlin/jackall/moncalc/viewmodel/TempleAnalyzeViewModel.kt index 23b632e..441ff07 100644 --- a/app/src/main/kotlin/jackall/moncalc/viewmodel/TempleAnalyzeViewModel.kt +++ b/app/src/main/kotlin/jackall/moncalc/viewmodel/TempleAnalyzeViewModel.kt @@ -42,7 +42,7 @@ entries.add(PieEntry(count.toFloat(), baseTempleName.get(attribute))) } } - pieChartModel = PieChartModel(entries, "") + pieChartModel = PieChartModel(entries.apply { sortByDescending { it.value } }, "") this.pieData = pieChartModel.pieData val items = ArrayList() @@ -66,7 +66,7 @@ ) ) } - this.items = items + this.items = items.apply { sortByDescending { it.count() } } } object Adapter {