separted UI and associated cose for Tweaks Details and Doze Details

DailyDozen/DailyDozen/App/Controllers/MainViewController.swift

@@ -135,9 +135,10 @@ class MainViewController: UIViewController {
  .instantiateInitialViewController() as? ServingsPagerViewController
  else { fatalError("Did not instantiate `ServingsPagerViewController`") }
 
- tabDailyDozenViewController.title = "Daily Dozen"
+ let titleDoze = NSLocalizedString("navtab.doze", comment: "Daily Dozen (proper noun) navigation tab")
+ tabDailyDozenViewController.title = titleDoze
  tabDailyDozenViewController.tabBarItem = UITabBarItem.init(
- title: "Daily Dozen", // shows below tab bar item icon
+ title: titleDoze, // shows below tab bar item icon
  image: UIImage(named: "ic_tabapp_dailydozen"),
  tag: 0
  )
@@ -151,9 +152,10 @@ class MainViewController: UIViewController {
  .instantiateInitialViewController() as? TweaksPagerViewController
  else { fatalError("Did not instantiate `TweaksPagerViewController`") }
 
- tabTweaksViewController.title = "21 Tweaks"
+ let titleTweak = NSLocalizedString("navtab.tweaks", comment: "Twenty-One Tweaks (proper noun) navigation tab")
+ tabTweaksViewController.title = titleTweak
  tabTweaksViewController.tabBarItem = UITabBarItem.init(
- title: "21 Tweaks",
+ title: titleTweak,
  image: UIImage(named: "ic_tabapp_21tweaks"),
  tag: 1
  )
@@ -167,9 +169,10 @@ class MainViewController: UIViewController {
  .instantiateInitialViewController() as? MenuTableViewController
  else { fatalError("Did not instantiate More `MenuTableViewController`") }
 
- tabInfoViewController.title = "More"
+ let titleInfo = NSLocalizedString("navtab.info", comment: "More Information navigation tab")
+ tabInfoViewController.title = titleInfo
  tabInfoViewController.tabBarItem = UITabBarItem.init(
- title: "More",
+ title: titleInfo,
  image: UIImage(named: "ic_tabapp_more"),
  tag: 0
  )
@@ -182,9 +185,10 @@ class MainViewController: UIViewController {
  .instantiateInitialViewController() as? SettingsViewController
  else { fatalError("Did not instantiate `SettingsViewController`") }
 
- tabSettingsViewController.title = "Settings"
+ let titleSettings = NSLocalizedString("navtab.preferences", comment: "Preferences (aka Settings, Configuration) navigation tab. Choose word different from 'Tweaks' translation")
+ tabSettingsViewController.title = titleSettings
  tabSettingsViewController.tabBarItem = UITabBarItem.init(
- title: "Settings",
+ title: titleSettings,
  image: UIImage(named: "ic_tabapp_settings"),
  tag: 0
  )

DailyDozen/DailyDozen/App/Texts/DozeTextsProvider.swift

@@ -12,19 +12,19 @@ class DozeTextsProvider {
  static let shared: DozeTextsProvider = {
  let decoder = JSONDecoder() 
  guard 
- let path = Bundle.main.path(forResource: "DozeDetails", ofType: "json"),
+ let path = Bundle.main.path(forResource: "DozeDetailData", ofType: "json"),
  let jsonString = try? String(contentsOfFile: path),
  let jsonData = jsonString.data(using: .utf8),
- let info = try? decoder.decode(DozeDetailsInfo.self, from: jsonData)
+ let info = try? decoder.decode(DozeDetailInfo.self, from: jsonData)
  else { 
- fatalError("DozeTextsProvider failed to load 'DozeDetails.json'") 
+ fatalError("DozeTextsProvider failed to load 'DozeDetailData.json'") 
  }
  return DozeTextsProvider(info: info)
  }()
 
- private let info: DozeDetailsInfo
+ private let info: DozeDetailInfo
 
- init(info: DozeDetailsInfo) {
+ init(info: DozeDetailInfo) {
  self.info = info
  }
 

DailyDozen/DailyDozen/App/Texts/LocalStrings/Base.lproj/TweakDetails.json → DailyDozen/DailyDozen/App/Texts/LocalStrings/Base.lproj/TweakDetailData.json

@@ -232,4 +232,4 @@
  "topic" : ""
  }
  }
-}
+}

DailyDozen/DailyDozen/App/Texts/LocalStrings/en.lproj/Localizable.strings

@@ -5,6 +5,15 @@
  Copyright © 2019 Nutritionfacts.org. All rights reserved.
 */
 
+/* Daily Dozen (proper noun) navigation tab */
+"navtab.doze"="Daily Dozen";
+/* Twenty-One Tweaks (proper noun) navigation tab */
+"navtab.tweaks"="Twenty-One Tweaks";
+/* More Information navigation tab */
+"navtab.info"="Info";
+/* Preferences (aka Settings, Configuration) navigation tab. Choose word different from 'Tweaks' translation */
+"navtab.preferences"="Settings";
+
 /* ***** Daily Dozen ***** */
 "dozeBeans.heading"="Beans";
 "dozeBerries.heading"="Berries";

DailyDozen/DailyDozen/App/Texts/LocalStrings/es.lproj/Localizable.strings

@@ -1,3 +1,13 @@
+
+/* Daily Dozen (proper noun) navigation tab */
+"navtab.doze"="Docena Diaria";
+/* Twenty-One Tweaks (proper noun) navigation tab */
+"navtab.tweaks"="Veintiún Ajustes";
+/* More Information navigation tab */
+"navtab.info"="Información";
+/* Preferences (aka Settings, Configuration) navigation tab. Choose word different from 'Tweaks' translation */
+"navtab.preferences"="Configuración";
+
 /* display heading. */
 "dozeBeans.heading" = "Frijoles";
 

DailyDozen/DailyDozen/App/Texts/TweakTextsProvider.swift

@@ -12,19 +12,19 @@ class TweakTextsProvider {
  static let shared: TweakTextsProvider = {
  let decoder = JSONDecoder() 
  guard 
- let path = Bundle.main.path(forResource: "TweakDetails", ofType: "json"),
+ let path = Bundle.main.path(forResource: "TweakDetailData", ofType: "json"),
  let jsonString = try? String(contentsOfFile: path),
  let jsonData = jsonString.data(using: .utf8),
- let info = try? decoder.decode(TweakDetailsInfo.self, from: jsonData)
+ let info = try? decoder.decode(TweakDetailInfo.self, from: jsonData)
  else { 
- fatalError("TweakTextsProvider failed to load 'TweakDetails.json'") 
+ fatalError("TweakTextsProvider failed to load 'TweakDetailData.json'") 
  }
  return TweakTextsProvider(info: info)
  }()
 
- private let info: TweakDetailsInfo
+ private let info: TweakDetailInfo
 
- init(info: TweakDetailsInfo) {
+ init(info: TweakDetailInfo) {
  self.info = info
  }
 

DailyDozen/DailyDozen/Database/DataRecords/DataCountRecord.swift

@@ -26,7 +26,7 @@ class DataCountRecord: Object {
 
  var pidParts: (datestamp: Date, countType: DataCountType)? {
  guard let date = Date.init(datestampKey: pidKeys.datestampKey),
- let countType = DataCountType(typeKey: pidKeys.typeKey) else {
+ let countType = DataCountType(itemTypeKey: pidKeys.typeKey) else {
  print(":ERROR: DataCountRecord has invalid datestamp or typeKey")
  return nil
  }
@@ -52,7 +52,7 @@ class DataCountRecord: Object {
 
  /// CSV Initialer.
  convenience init?(datestampKey: String, typeKey: String, count: Int = 0, streak: Int = 0) {
- guard let dataCountType = DataCountType(typeKey: typeKey),
+ guard let dataCountType = DataCountType(itemTypeKey: typeKey),
  Date(datestampKey: datestampKey) != nil else {
  return nil
  }

DailyDozen/DailyDozen/Database/DataRecords/DataCountType.swift

@@ -51,8 +51,8 @@ enum DataCountType: String, CaseIterable {
  case tweakNightlySleep
  case tweakNightlyTrendelenbrug
 
- init?(typeKey: String) {
- self = DataCountType(rawValue: String(typeKey))!
+ init?(itemTypeKey: String) {
+ self = DataCountType(rawValue: String(itemTypeKey))!
  }
 
  var typeKey: String {

DailyDozen/DailyDozen/DozeSection/DozeDetail/Controllers/DozeDetailSizeCell.swift

@@ -0,0 +1,22 @@
+//
+// DozeDetailSizeCell.swift
+// DailyDozen
+//
+// Copyright © 2020 Nutritionfacts.org. All rights reserved.
+//
+
+import UIKit
+
+class DozeDetailSizeCell: UITableViewCell {
+
+ // MARK: - Outlets
+ @IBOutlet private weak var titleLabel: UILabel!
+
+ // MARK: - Methods.
+ /// Sets the new title text.
+ ///
+ /// - Parameter title: The new title text.
+ func configure(title: String) {
+ titleLabel.text = title
+ }
+}

DailyDozen/DailyDozen/DozeSection/DozeDetails/Controllers/TypesCell.swift → DailyDozen/DailyDozen/DozeSection/DozeDetail/Controllers/DozeDetailTypeCell.swift

@@ -1,14 +1,13 @@
 //
-// TypesCell.swift
+// DozeDetailTypeCell.swift
 // DailyDozen
 //
-// Created by Konstantin Khokhlov on 10.11.17.
-// Copyright © 2017 Nutritionfacts.org. All rights reserved.
+// Copyright © 2019 Nutritionfacts.org. All rights reserved.
 //
 
 import UIKit
 
-class TypesCell: UITableViewCell {
+class DozeDetailTypeCell: UITableViewCell {
 
  // MARK: - Outlets
  @IBOutlet private weak var titleLabel: UILabel!

DailyDozen/DailyDozen/DozeSection/DozeDetails/Controllers/DozeDetailsViewController.swift → DailyDozen/DailyDozen/DozeSection/DozeDetail/Controllers/DozeDetailViewController.swift

@@ -1,33 +1,32 @@
 //
-// DozeDetailsViewController.swift
+// DozeDetailViewController.swift
 // DailyDozen
 //
-// Created by Konstantin Khokhlov on 31.10.17.
-// Copyright © 2017 Nutritionfacts.org. All rights reserved.
+// Copyright © 2019 Nutritionfacts.org. All rights reserved.
 //
 
 import UIKit
 
 // MARK: - Builder
-class DozeDetailsBuilder {
+class DozeDetailBuilder {
 
  // MARK: - Nested
  struct Strings {
- static let storyboardDetailsDoze = "DetailsDoze"
+ static let storyboardDetailsDoze = "DozeDetailLayout"
  }
 
  // MARK: - Methods
  /// Instantiates and returns the initial view controller for a storyboard.
  ///
  /// - Parameter itemTypeKey: An item type key string.
  /// - Returns: The initial view controller in the storyboard.
- static func instantiateController(itemTypeKey: String) -> DozeDetailsViewController {
+ static func instantiateController(itemTypeKey: String) -> DozeDetailViewController {
 
  let storyboard = UIStoryboard(name: Strings.storyboardDetailsDoze, bundle: nil)
  guard
  let viewController = storyboard
- .instantiateInitialViewController() as? DozeDetailsViewController
- else { fatalError("Did not instantiate `DozeDetails` controller") }
+ .instantiateInitialViewController() as? DozeDetailViewController
+ else { fatalError("Did not instantiate `DozeDetailData` controller") }
 
  viewController.setViewModel(itemTypeKey: itemTypeKey)
 
@@ -36,7 +35,7 @@ class DozeDetailsBuilder {
 }
 
 // MARK: - Controller
-class DozeDetailsViewController: UIViewController {
+class DozeDetailViewController: UIViewController {
 
  // MARK: - Nested
  private struct Keys {
@@ -45,7 +44,7 @@ class DozeDetailsViewController: UIViewController {
 
  // MARK: - Outlets
  @IBOutlet private weak var tableView: UITableView!
- @IBOutlet private weak var dataProvider: DozeDetailsDataProvider!
+ @IBOutlet private weak var dataProvider: DozeDetailDataProvider!
  @IBOutlet private weak var titleLabel: UILabel!
  @IBOutlet private weak var detailsImageView: UIImageView!
 
@@ -61,7 +60,7 @@ class DozeDetailsViewController: UIViewController {
 
  if let dataCountType = dataProvider.dataCountType {
  if dataCountType.typeKey.prefix(4) == "doze" {
- // DozeDetailsViewController VIDEOS
+ // DozeDetailViewController VIDEOS
  navigationItem.rightBarButtonItem = UIBarButtonItem(
  title: Keys.videos,
  style: .done,
@@ -88,7 +87,7 @@ class DozeDetailsViewController: UIViewController {
  ///
  /// - Parameter item: The current item name.
  func setViewModel(itemTypeKey: String) {
- dataProvider.dataCountType = DataCountType(typeKey: itemTypeKey)
+ dataProvider.dataCountType = DataCountType(itemTypeKey: itemTypeKey)
  dataProvider.viewModel = DozeTextsProvider.shared.getDetails(itemTypeKey: itemTypeKey)
  }
 
@@ -105,7 +104,7 @@ class DozeDetailsViewController: UIViewController {
  ///
  /// - Parameter sender: The button.
  @IBAction private func unitsChanged(_ sender: UIButton) {
- let sectionIndex = DetailsSection.sizes.rawValue
+ let sectionIndex = DozeDetailSection.amount.rawValue
  guard
  let unitsTypePrefStr = UserDefaults.standard.string(forKey: SettingsKeys.unitsTypePref),
  let currentUnitsType = UnitsType(rawValue: unitsTypePrefStr),
@@ -130,14 +129,14 @@ class DozeDetailsViewController: UIViewController {
 }
 
 // MARK: - UITableViewDelegate
-extension DozeDetailsViewController: UITableViewDelegate {
+extension DozeDetailViewController: UITableViewDelegate {
 
  func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
- guard let sectionType = DetailsSection(rawValue: indexPath.section) else {
+ guard let sectionType = DozeDetailSection(rawValue: indexPath.section) else {
  fatalError("There should be a section type")
  }
 
- if sectionType == .types &&
+ if sectionType == .example &&
  dataProvider.dataCountType.isTweak {
  let x = CGFloat(0.0)
  let y = CGFloat(0.0)
@@ -166,19 +165,19 @@ extension DozeDetailsViewController: UITableViewDelegate {
  }
 
  func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
- guard let sectionType = DetailsSection(rawValue: section) else {
+ guard let sectionType = DozeDetailSection(rawValue: section) else {
  fatalError("There should be a section type")
  }
  return sectionType.headerHeight
  }
 
  func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
- guard let sectionType = DetailsSection(rawValue: section) else {
- fatalError("There should be a section type")
+ guard let sectionType = DozeDetailSection(rawValue: section) else {
+ fatalError("There should be a doze section type")
  }
  if let dataCountType = dataProvider.dataCountType {
  if dataCountType.typeKey.prefix(5) == "tweak" {
- return sectionType.headerTweaksView
+ return sectionType.headerView
  }
  }
  return sectionType.headerView