isoron
/
loop
mirror of https://github.com/iSoron/uhabits.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename to DetailScreenController; pass habit as argument

Browse Source
pull/498/head
Alinson S. Xavier 7 years ago
parent 979affef22
commit 48c3ff584a
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File

12
ios/Application/Frontend/ShowHabitController.swift → ios/Application/Frontend/DetailScreenController.swift
Unescape View File

@ -19,9 +19,10 @@
import UIKit import UIKit
class ShowHabitController : UITableViewController { class DetailScreenController : UITableViewController {
let theme: Theme let theme: Theme
let habit: Habit
let color: Color let color: Color
var cells = [UITableViewCell]() var cells = [UITableViewCell]()
@ -29,14 +30,15 @@ class ShowHabitController : UITableViewController {
fatalError() fatalError()
} }
init(theme: Theme, color: Color) { init(habit: Habit, backend: Backend) {
self.theme = theme self.theme = backend.theme
self.color = color self.habit = habit
self.color = theme.color(paletteIndex: self.habit.color.index)
super.init(style: .grouped) super.init(style: .grouped)
} }
override func viewDidLoad() { override func viewDidLoad() {
self.title = "Exercise" self.title = habit.name
self.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .edit, self.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .edit,
target: self, target: self,
action: #selector(self.onEditHabitClicked)) action: #selector(self.onEditHabitClicked))

6
ios/Application/Frontend/MainScreenController.swift
Unescape View File

@ -164,9 +164,9 @@ class MainScreenController: UITableViewController, MainScreenDataSourceListener
} }
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let color = theme.color(paletteIndex: data!.habits[indexPath.row].color.index) let habit = data!.habits[indexPath.row]
self.navigationController?.pushViewController(ShowHabitController(theme: theme, let color = theme.color(paletteIndex: habit.color.index)
color: color), self.navigationController?.pushViewController(DetailScreenController(habit: habit, backend: backend),
animated: true) animated: true)
} }

8
ios/uhabits.xcodeproj/project.pbxproj
Unescape View File

@ -26,7 +26,7 @@
00C0C6D92247DC13003D8AF0 /* IosCanvasTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00C0C6D82247DC13003D8AF0 /* IosCanvasTest.swift */; }; 00C0C6D92247DC13003D8AF0 /* IosCanvasTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00C0C6D82247DC13003D8AF0 /* IosCanvasTest.swift */; };
00C0C6DB2247E6B0003D8AF0 /* IosDates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00C0C6DA2247E6B0003D8AF0 /* IosDates.swift */; }; 00C0C6DB2247E6B0003D8AF0 /* IosDates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00C0C6DA2247E6B0003D8AF0 /* IosDates.swift */; };
00C0C6DD2247E6C4003D8AF0 /* IosDatesTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00C0C6DC2247E6C4003D8AF0 /* IosDatesTest.swift */; }; 00C0C6DD2247E6C4003D8AF0 /* IosDatesTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00C0C6DC2247E6C4003D8AF0 /* IosDatesTest.swift */; };
00C0C6E0224A3602003D8AF0 /* ShowHabitController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00C0C6DE224A35FC003D8AF0 /* ShowHabitController.swift */; }; 00C0C6E0224A3602003D8AF0 /* DetailScreenController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00C0C6DE224A35FC003D8AF0 /* DetailScreenController.swift */; };
00D48BD12200A31300CC4527 /* Launch.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 00D48BD02200A31300CC4527 /* Launch.storyboard */; }; 00D48BD12200A31300CC4527 /* Launch.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 00D48BD02200A31300CC4527 /* Launch.storyboard */; };
00D48BD32200AC1600CC4527 /* EditHabitController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00D48BD22200AC1600CC4527 /* EditHabitController.swift */; }; 00D48BD32200AC1600CC4527 /* EditHabitController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00D48BD22200AC1600CC4527 /* EditHabitController.swift */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
@ -78,7 +78,7 @@
00C0C6D82247DC13003D8AF0 /* IosCanvasTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosCanvasTest.swift; sourceTree = "<group>"; }; 00C0C6D82247DC13003D8AF0 /* IosCanvasTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosCanvasTest.swift; sourceTree = "<group>"; };
00C0C6DA2247E6B0003D8AF0 /* IosDates.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosDates.swift; sourceTree = "<group>"; }; 00C0C6DA2247E6B0003D8AF0 /* IosDates.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosDates.swift; sourceTree = "<group>"; };
00C0C6DC2247E6C4003D8AF0 /* IosDatesTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosDatesTest.swift; sourceTree = "<group>"; }; 00C0C6DC2247E6C4003D8AF0 /* IosDatesTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosDatesTest.swift; sourceTree = "<group>"; };
00C0C6DE224A35FC003D8AF0 /* ShowHabitController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowHabitController.swift; sourceTree = "<group>"; }; 00C0C6DE224A35FC003D8AF0 /* DetailScreenController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailScreenController.swift; sourceTree = "<group>"; };
00D48BD02200A31300CC4527 /* Launch.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Launch.storyboard; sourceTree = "<group>"; }; 00D48BD02200A31300CC4527 /* Launch.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Launch.storyboard; sourceTree = "<group>"; };
00D48BD22200AC1600CC4527 /* EditHabitController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditHabitController.swift; sourceTree = "<group>"; }; 00D48BD22200AC1600CC4527 /* EditHabitController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditHabitController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
@ -108,7 +108,7 @@
children = ( children = (
00D48BD22200AC1600CC4527 /* EditHabitController.swift */, 00D48BD22200AC1600CC4527 /* EditHabitController.swift */,
00A5B42922009F590024E00C /* MainScreenController.swift */, 00A5B42922009F590024E00C /* MainScreenController.swift */,
00C0C6DE224A35FC003D8AF0 /* ShowHabitController.swift */, 00C0C6DE224A35FC003D8AF0 /* DetailScreenController.swift */,
); );
path = Frontend; path = Frontend;
sourceTree = "<group>"; sourceTree = "<group>";
@ -329,7 +329,7 @@
00C0C6AA224654F4003D8AF0 /* IosFiles.swift in Sources */, 00C0C6AA224654F4003D8AF0 /* IosFiles.swift in Sources */,
00C0C6D122470705003D8AF0 /* IosCanvas.swift in Sources */, 00C0C6D122470705003D8AF0 /* IosCanvas.swift in Sources */,
00C0C6CE2246EFB3003D8AF0 /* IosExtensions.swift in Sources */, 00C0C6CE2246EFB3003D8AF0 /* IosExtensions.swift in Sources */,
00C0C6E0224A3602003D8AF0 /* ShowHabitController.swift in Sources */, 00C0C6E0224A3602003D8AF0 /* DetailScreenController.swift in Sources */,
00C0C6A8224654A2003D8AF0 /* IosDatabase.swift in Sources */, 00C0C6A8224654A2003D8AF0 /* IosDatabase.swift in Sources */,
00C0C6DB2247E6B0003D8AF0 /* IosDates.swift in Sources */, 00C0C6DB2247E6B0003D8AF0 /* IosDates.swift in Sources */,
00A5B42A22009F590024E00C /* MainScreenController.swift in Sources */, 00A5B42A22009F590024E00C /* MainScreenController.swift in Sources */,

Write Preview
Loading…
Cancel
Save