From 49415a3d5cd5f38c052d5b270488f9558f6241d0 Mon Sep 17 00:00:00 2001
From: Eskil Gjerde Sviggum <eskilsviggum@gmail.com>
Date: Thu, 8 Aug 2024 18:59:39 +0200
Subject: [PATCH] =?UTF-8?q?More=20renaming=20=E2=80=9Ccycle=20between=20di?=
 =?UTF-8?q?visions=E2=80=9D=20to=20=E2=80=9Ccycle=20sizes=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rectangle/CycleSize.swift                          | 12 ++++++------
 Rectangle/PrefsWindow/SettingsViewController.swift | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Rectangle/CycleSize.swift b/Rectangle/CycleSize.swift
index ee4e065c..9a912e81 100644
--- a/Rectangle/CycleSize.swift
+++ b/Rectangle/CycleSize.swift
@@ -33,16 +33,16 @@ enum CycleSize: Int, CaseIterable {
     // For example if all cycles are used, the order should be:
     // 1/2, 2/3, 3/4, 1/4, 1/3
     static var sortedSizes: [CycleSize] = {
-        let sortedDivisions = Self.allCases.sorted(by: { $0.fraction < $1.fraction })
+        let sortedSizes = Self.allCases.sorted(by: { $0.fraction < $1.fraction })
         
-        guard let firstDivisionIndex = sortedDivisions.firstIndex(of: firstSize) else {
-            return sortedDivisions
+        guard let firstSizeIndex = sortedSizes.firstIndex(of: firstSize) else {
+            return sortedSizes
         }
         
-        let lessThanFistDivision = sortedDivisions[0..<firstDivisionIndex]
-        let greaterThanFistDivision = sortedDivisions[(firstDivisionIndex + 1)..<sortedDivisions.count]
+        let lessThanFistSizes = sortedSizes[0..<firstSizeIndex]
+        let greaterThanFistSizes = sortedSizes[(firstSizeIndex + 1)..<sortedSizes.count]
         
-        return [firstSize] + greaterThanFistDivision + lessThanFistDivision
+        return [firstSize] + greaterThanFistSizes + lessThanFistSizes
     }()
 }
 
diff --git a/Rectangle/PrefsWindow/SettingsViewController.swift b/Rectangle/PrefsWindow/SettingsViewController.swift
index d0d8f943..c9065e1c 100644
--- a/Rectangle/PrefsWindow/SettingsViewController.swift
+++ b/Rectangle/PrefsWindow/SettingsViewController.swift
@@ -73,7 +73,7 @@ class SettingsViewController: NSViewController {
         }
 
         Defaults.subsequentExecutionMode.value = mode
-        initializeCycleBetweenOptionsView(animated: true)
+        initializeCycleSizesView(animated: true)
     }
     
     @IBAction func gapSliderChanged(_ sender: NSSlider) {
@@ -246,12 +246,12 @@ class SettingsViewController: NSViewController {
         }
         self.cycleSizeCheckboxes = cycleSizeCheckboxes
         
-        initializeCycleBetweenOptionsView(animated: false)
+        initializeCycleSizesView(animated: false)
         
         Notification.Name.configImported.onPost(using: {_ in
             self.initializeTodoModeSettings()
             self.initializeToggles()
-            self.initializeCycleBetweenOptionsView(animated: false)
+            self.initializeCycleSizesView(animated: false)
         })
         
         Notification.Name.menuBarIconHidden.onPost(using: {_ in
@@ -314,7 +314,7 @@ class SettingsViewController: NSViewController {
         setToggleStatesForCycleSizeCheckboxes()
     }
     
-    private func initializeCycleBetweenOptionsView(animated: Bool = false) {
+    private func initializeCycleSizesView(animated: Bool = false) {
         let showOptionsView = Defaults.subsequentExecutionMode.value == .resize
         
         if showOptionsView {
@@ -359,7 +359,7 @@ class SettingsViewController: NSViewController {
         let rawValue = checkbox.tag
         
         guard let cycleSize = CycleSize(rawValue: rawValue) else {
-            Logger.log("Expected tag of cycle between checkbox to match a value of CycleBetweenDivision. Got: \(String(describing: rawValue))")
+            Logger.log("Expected tag of cycle size checkbox to match a value of CycleSize. Got: \(String(describing: rawValue))")
             return
         }