Skip to content

Commit

Permalink
Allow user to show/hide archived and completed habits
Browse files Browse the repository at this point in the history
  • Loading branch information
@iSoron
iSoron committed Apr 2, 2019
1 parent 90f553b commit 082c575
Show file tree
Hide file tree
Showing 6 changed files with 84 additions and 45 deletions.
Binary file modified core/assets/main/databases/template.db
View file
Binary file not shown.
5 changes: 2 additions & 3 deletions core/src/commonMain/kotlin/org/isoron/uhabits/backend/Backend.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ class Backend(databaseName: String,
checkmarks[habit]?.setManualCheckmarks(checks)
}
}
mainScreenDataSource = MainScreenDataSource(habits,
mainScreenDataSource = MainScreenDataSource(preferences,
habits,
checkmarks,
taskRunner)
}
Expand Down Expand Up @@ -99,6 +100,4 @@ class Backend(databaseName: String,
habitsRepository.update(modified)
}
}


}
33 changes: 25 additions & 8 deletions core/src/commonMain/kotlin/org/isoron/uhabits/backend/MainScreenDataSource.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ package org.isoron.uhabits.backend
import org.isoron.platform.concurrency.*
import org.isoron.platform.time.*
import org.isoron.uhabits.models.*
import org.isoron.uhabits.models.Checkmark.Companion.UNCHECKED

class MainScreenDataSource(val habits: MutableMap<Int, Habit>,
class MainScreenDataSource(val preferences: Preferences,
val habits: MutableMap<Int, Habit>,
val checkmarks: MutableMap<Habit, CheckmarkList>,
val taskRunner: TaskRunner) {

Expand All @@ -41,16 +43,31 @@ class MainScreenDataSource(val habits: MutableMap<Int, Habit>,

fun requestData() {
taskRunner.runInBackground {
val filtered = habits.values.filter { h -> !h.isArchived }
val currentScores = filtered.associate { it to 0.0 /* TODO */}
val recentCheckmarks = filtered.associate {
val allValues = checkmarks[it]!!.getValuesUntil(today)
if (allValues.size <= 7) it to allValues
else it to allValues.subList(0, 7)
var filtered = habits.values.toList()

if (!preferences.showArchived) {
filtered = filtered.filter { !it.isArchived }
}

val recentCheckmarks = filtered.associate { habit ->
val allValues = checkmarks.getValue(habit).getValuesUntil(today)
if (allValues.size <= 7) habit to allValues
else habit to allValues.subList(0, 7)
}
val data = Data(filtered, currentScores, recentCheckmarks)

if (!preferences.showCompleted) {
filtered = filtered.filter { habit ->
recentCheckmarks.getValue(habit)[0] == UNCHECKED
}
}

val currentScores = filtered.associate {
it to 0.0 /* TODO */
}

taskRunner.runInForeground {
observable.notifyListeners { listener ->
val data = Data(filtered, currentScores, recentCheckmarks)
listener.onDataChanged(data)
}
}
Expand Down
1 change: 1 addition & 0 deletions core/src/commonMain/kotlin/org/isoron/uhabits/i18n/Strings.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,4 +186,5 @@ open class Strings() {
open val weekends = "Weekends"
open val year = "Year"
open val yes = "Yes"
open val day_mode = "Day mode"
}
86 changes: 56 additions & 30 deletions ios/Application/Frontend/MainScreenController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,11 @@ class MainScreenCell : UITableViewCell {
fatalError()
}

func update(name: String,
color: Color,
values: [KotlinInt]) {

label.text = name
func update(habit: Habit, values: [KotlinInt], theme: Theme) {
var color = theme.color(paletteIndex: habit.color.index)
if habit.isArchived { color = theme.mediumContrastTextColor }
label.text = habit.name
label.textColor = color.uicolor

ring.component = Ring(color: color,
percentage: Double.random(in: 0...1),
thickness: 2.5,
Expand All @@ -90,6 +88,7 @@ class MainScreenController: UITableViewController, MainScreenDataSourceListener
var backend: Backend
var dataSource: MainScreenDataSource
var data: MainScreenDataSource.Data?
var preferences: Preferences
var theme: Theme
var nButtons = 3
var strings: Strings
Expand All @@ -103,14 +102,11 @@ class MainScreenController: UITableViewController, MainScreenDataSourceListener
self.strings = backend.strings
self.dataSource = backend.mainScreenDataSource
self.theme = backend.theme
self.preferences = backend.preferences
super.init(nibName: nil, bundle: nil)
self.dataSource.observable.addListener(listener: self)
self.dataSource.requestData()
}

func onDataChanged(newData: MainScreenDataSource.Data) {
self.data = newData
}

override func viewDidLoad() {
self.title = strings.main_activity_title
Expand Down Expand Up @@ -140,12 +136,9 @@ class MainScreenController: UITableViewController, MainScreenDataSourceListener
}

override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let row = indexPath.row
let cell = tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath) as! MainScreenCell
let habit = data!.habits[row]
cell.update(name: habit.name,
color: theme.color(paletteIndex: habit.color.index),
values: data!.checkmarkValues[habit]!)
let habit = data!.habits[indexPath.row]
cell.update(habit: habit, values: data!.checkmarkValues[habit]!, theme: theme)
return cell
}

Expand All @@ -168,9 +161,7 @@ class MainScreenController: UITableViewController, MainScreenDataSourceListener

override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let habit = data!.habits[indexPath.row]
let color = theme.color(paletteIndex: habit.color.index)
self.navigationController?.pushViewController(DetailScreenController(habit: habit, backend: backend),
animated: true)
self.navigationController?.pushViewController(DetailScreenController(habit: habit, backend: backend), animated: true)
}

@objc func onCreateHabitClicked() {
Expand All @@ -179,18 +170,47 @@ class MainScreenController: UITableViewController, MainScreenDataSourceListener

@objc func onMoreActionsClicked() {
let alert = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
alert.addAction(UIAlertAction(title: strings.show_archived, style: .default) {
(action: UIAlertAction) -> Void in
// TODO
})
alert.addAction(UIAlertAction(title: strings.hide_completed, style: .default) {
(action: UIAlertAction) -> Void in
// TODO
})
alert.addAction(UIAlertAction(title: strings.night_mode, style: .default) {
(action: UIAlertAction) -> Void in
// TODO
})

if preferences.showArchived {
alert.addAction(UIAlertAction(title: strings.hide_archived, style: .default) {
(action: UIAlertAction) -> Void in
self.preferences.showArchived = false
self.dataSource.requestData()
})
} else {
alert.addAction(UIAlertAction(title: strings.show_archived, style: .default) {
(action: UIAlertAction) -> Void in
self.preferences.showArchived = true
self.dataSource.requestData()
})
}

if preferences.showCompleted {
alert.addAction(UIAlertAction(title: strings.hide_completed, style: .default) {
(action: UIAlertAction) -> Void in
self.preferences.showCompleted = false
self.dataSource.requestData()
})
} else {
alert.addAction(UIAlertAction(title: strings.show_completed, style: .default) {
(action: UIAlertAction) -> Void in
self.preferences.showCompleted = true
self.dataSource.requestData()
})
}

if preferences.nightMode {
alert.addAction(UIAlertAction(title: strings.day_mode, style: .default) {
(action: UIAlertAction) -> Void in
self.preferences.nightMode = false
})
} else {
alert.addAction(UIAlertAction(title: strings.night_mode, style: .default) {
(action: UIAlertAction) -> Void in
self.preferences.nightMode = true
})
}

alert.addAction(UIAlertAction(title: strings.help, style: .default) {
(action: UIAlertAction) -> Void in
// TODO
Expand All @@ -205,4 +225,10 @@ class MainScreenController: UITableViewController, MainScreenDataSourceListener
})
present(alert, animated: true, completion: nil)
}

func onDataChanged(newData: MainScreenDataSource.Data) {
data = newData
let sections = NSIndexSet(indexesIn: NSMakeRange(0, self.tableView.numberOfSections))
tableView.reloadSections(sections as IndexSet, with: .automatic)
}
}
4 changes: 0 additions & 4 deletions ios/uhabits.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
0057EC2B224C4CDB00C49288 /* icons in Resources */ = {isa = PBXBuildFile; fileRef = 0057EC2A224C4CDB00C49288 /* icons */; };
006EFE4C2252E9F3008464E0 /* IosLocaleTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 006EFE4A2252E9D3008464E0 /* IosLocaleTest.swift */; };
006EFE4E2252EA2B008464E0 /* IosLocale.swift in Sources */ = {isa = PBXBuildFile; fileRef = 006EFE4D2252EA2B008464E0 /* IosLocale.swift */; };
00A5B42822009F590024E00C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00A5B42722009F590024E00C /* AppDelegate.swift */; };
Expand Down Expand Up @@ -58,7 +57,6 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
0057EC2A224C4CDB00C49288 /* icons */ = {isa = PBXFileReference; lastKnownFileType = folder; path = icons; sourceTree = "<group>"; };
006EFE4A2252E9D3008464E0 /* IosLocaleTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosLocaleTest.swift; sourceTree = "<group>"; };
006EFE4D2252EA2B008464E0 /* IosLocale.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosLocale.swift; sourceTree = "<group>"; };
00A5B42422009F590024E00C /* uhabits.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = uhabits.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -171,7 +169,6 @@
00C0C6C022465F80003D8AF0 /* Assets */ = {
isa = PBXGroup;
children = (
0057EC2A224C4CDB00C49288 /* icons */,
00C0C6BB22465F65003D8AF0 /* databases */,
00C0C6BA22465F65003D8AF0 /* fonts */,
00C0C6BC22465F65003D8AF0 /* migrations */,
Expand Down Expand Up @@ -291,7 +288,6 @@
00C0C6BD22465F65003D8AF0 /* fonts in Resources */,
00C0C6BE22465F65003D8AF0 /* databases in Resources */,
00C0C6BF22465F65003D8AF0 /* migrations in Resources */,
0057EC2B224C4CDB00C49288 /* icons in Resources */,
00A5B42F22009F5A0024E00C /* Assets.xcassets in Resources */,
00D48BD12200A31300CC4527 /* Launch.storyboard in Resources */,
);
Expand Down

0 comments on commit 082c575

Please sign in to comment.