From 48c3ff584a3b79f66e3e00fd742f5dc67ed07b30 Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Sun, 31 Mar 2019 19:43:20 -0500 Subject: [PATCH] Rename to DetailScreenController; pass habit as argument --- ...Controller.swift => DetailScreenController.swift} | 12 +++++++----- ios/Application/Frontend/MainScreenController.swift | 6 +++--- ios/uhabits.xcodeproj/project.pbxproj | 8 ++++---- 3 files changed, 14 insertions(+), 12 deletions(-) rename ios/Application/Frontend/{ShowHabitController.swift => DetailScreenController.swift} (91%) diff --git a/ios/Application/Frontend/ShowHabitController.swift b/ios/Application/Frontend/DetailScreenController.swift similarity index 91% rename from ios/Application/Frontend/ShowHabitController.swift rename to ios/Application/Frontend/DetailScreenController.swift index d85a7687a..a5ebdb413 100644 --- a/ios/Application/Frontend/ShowHabitController.swift +++ b/ios/Application/Frontend/DetailScreenController.swift @@ -19,9 +19,10 @@ import UIKit -class ShowHabitController : UITableViewController { +class DetailScreenController : UITableViewController { let theme: Theme + let habit: Habit let color: Color var cells = [UITableViewCell]() @@ -29,14 +30,15 @@ class ShowHabitController : UITableViewController { fatalError() } - init(theme: Theme, color: Color) { - self.theme = theme - self.color = color + init(habit: Habit, backend: Backend) { + self.theme = backend.theme + self.habit = habit + self.color = theme.color(paletteIndex: self.habit.color.index) super.init(style: .grouped) } override func viewDidLoad() { - self.title = "Exercise" + self.title = habit.name self.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .edit, target: self, action: #selector(self.onEditHabitClicked)) diff --git a/ios/Application/Frontend/MainScreenController.swift b/ios/Application/Frontend/MainScreenController.swift index f50d25f54..c496dc395 100644 --- a/ios/Application/Frontend/MainScreenController.swift +++ b/ios/Application/Frontend/MainScreenController.swift @@ -164,9 +164,9 @@ class MainScreenController: UITableViewController, MainScreenDataSourceListener } override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - let color = theme.color(paletteIndex: data!.habits[indexPath.row].color.index) - self.navigationController?.pushViewController(ShowHabitController(theme: theme, - color: color), + let habit = data!.habits[indexPath.row] + let color = theme.color(paletteIndex: habit.color.index) + self.navigationController?.pushViewController(DetailScreenController(habit: habit, backend: backend), animated: true) } diff --git a/ios/uhabits.xcodeproj/project.pbxproj b/ios/uhabits.xcodeproj/project.pbxproj index 85ffd573c..e20828d91 100644 --- a/ios/uhabits.xcodeproj/project.pbxproj +++ b/ios/uhabits.xcodeproj/project.pbxproj @@ -26,7 +26,7 @@ 00C0C6D92247DC13003D8AF0 /* IosCanvasTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00C0C6D82247DC13003D8AF0 /* IosCanvasTest.swift */; }; 00C0C6DB2247E6B0003D8AF0 /* IosDates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00C0C6DA2247E6B0003D8AF0 /* IosDates.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 */; }; 00D48BD32200AC1600CC4527 /* EditHabitController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00D48BD22200AC1600CC4527 /* EditHabitController.swift */; }; /* End PBXBuildFile section */ @@ -78,7 +78,7 @@ 00C0C6D82247DC13003D8AF0 /* IosCanvasTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosCanvasTest.swift; sourceTree = ""; }; 00C0C6DA2247E6B0003D8AF0 /* IosDates.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosDates.swift; sourceTree = ""; }; 00C0C6DC2247E6C4003D8AF0 /* IosDatesTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosDatesTest.swift; sourceTree = ""; }; - 00C0C6DE224A35FC003D8AF0 /* ShowHabitController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowHabitController.swift; sourceTree = ""; }; + 00C0C6DE224A35FC003D8AF0 /* DetailScreenController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailScreenController.swift; sourceTree = ""; }; 00D48BD02200A31300CC4527 /* Launch.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Launch.storyboard; sourceTree = ""; }; 00D48BD22200AC1600CC4527 /* EditHabitController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditHabitController.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -108,7 +108,7 @@ children = ( 00D48BD22200AC1600CC4527 /* EditHabitController.swift */, 00A5B42922009F590024E00C /* MainScreenController.swift */, - 00C0C6DE224A35FC003D8AF0 /* ShowHabitController.swift */, + 00C0C6DE224A35FC003D8AF0 /* DetailScreenController.swift */, ); path = Frontend; sourceTree = ""; @@ -329,7 +329,7 @@ 00C0C6AA224654F4003D8AF0 /* IosFiles.swift in Sources */, 00C0C6D122470705003D8AF0 /* IosCanvas.swift in Sources */, 00C0C6CE2246EFB3003D8AF0 /* IosExtensions.swift in Sources */, - 00C0C6E0224A3602003D8AF0 /* ShowHabitController.swift in Sources */, + 00C0C6E0224A3602003D8AF0 /* DetailScreenController.swift in Sources */, 00C0C6A8224654A2003D8AF0 /* IosDatabase.swift in Sources */, 00C0C6DB2247E6B0003D8AF0 /* IosDates.swift in Sources */, 00A5B42A22009F590024E00C /* MainScreenController.swift in Sources */,