isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 01:08:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Migrate Scores to pure Kotlin; display correct score on main screen

Browse Source
This commit is contained in:
Alinson S. Xavier
2019-04-06 18:53:22 -05:00
parent 6d527a31d7
commit c16a0ecd65
8 changed files with 199 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ios/Application/Frontend/MainScreenController.swift
View File

@@ -31,7 +31,7 @@ class MainScreenCell : UITableViewCell {
fatalError()
}
func update(habit: Habit, values: [KotlinInt], theme: Theme, nButtons: Int) {
func update(habit: Habit, checkmarks: [Checkmark], score: Score, theme: Theme, nButtons: Int) {
if buttons.count != nButtons {
buttons.removeAll()
for v in contentView.subviews { v.removeFromSuperview() }
@@ -68,7 +68,7 @@ class MainScreenCell : UITableViewCell {
label.text = habit.name
label.textColor = color.uicolor
ring.component = Ring(color: color,
percentage: Double.random(in: 0...1),
percentage: score.value,
thickness: 2.5,
radius: 7,
theme: theme,
@@ -78,12 +78,12 @@ class MainScreenCell : UITableViewCell {
for i in 0..<buttons.count {
if habit.type == .numerical {
buttons[i].component = NumberButton(color: color,
value: Double(truncating: values[i]) / 1000.0,
value: Double(checkmarks[i].value) / 1000.0,
threshold: habit.target,
units: habit.unit,
theme: theme)
} else {
buttons[i].component = CheckmarkButton(value: Int32(truncating: values[i]),
buttons[i].component = CheckmarkButton(value: checkmarks[i].value,
color: color,
theme: theme)
}
@@ -148,7 +148,11 @@ class MainScreenController: UITableViewController, MainScreenDataSourceListener
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath) as! MainScreenCell
let habit = data!.habits[indexPath.row]
cell.update(habit: habit, values: data!.checkmarkValues[habit]!, theme: theme, nButtons: nButtons)
cell.update(habit: habit,
checkmarks: data!.checkmarks[habit]!,
score: data!.scores[habit]!,
theme: theme,
nButtons: nButtons)
return cell
}