Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/improvements #82

Merged
merged 3 commits into from
Jan 2, 2024
Merged

Feature/improvements #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed78a2f
Removes v2 views
DeluxeAlonso Jan 2, 2024
40e78b0
Merge branch 'development' of https://github.com/DeluxeAlonso/Calcula…
DeluxeAlonso Jan 2, 2024
3da0c3a
Adds missing final keywords
DeluxeAlonso Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions CalculatorReplicaSwiftUI.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@
E2CBA5182442C3D3008A3097 /* CalculatorButtonProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2CBA5172442C3D3008A3097 /* CalculatorButtonProtocol.swift */; };
E2CBA51C2442C660008A3097 /* CalculatorButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2CBA51B2442C660008A3097 /* CalculatorButton.swift */; };
E2CBA51E2442C7D3008A3097 /* CalculatorBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2CBA51D2442C7D3008A3097 /* CalculatorBuilder.swift */; };
E2CD3AF62B316E8D00B8F955 /* CalculatorTextButtonV2.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2CD3AF52B316E8D00B8F955 /* CalculatorTextButtonV2.swift */; };
E2CD3AF82B316F0E00B8F955 /* CalculatorImageButtonV2.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2CD3AF72B316F0E00B8F955 /* CalculatorImageButtonV2.swift */; };
E2DA4B072453BF2100B9D981 /* CalculatorButtonTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2DA4B062453BF2100B9D981 /* CalculatorButtonTests.swift */; };
E2DA4B092453C25A00B9D981 /* PendingBinaryOperationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2DA4B082453C25A00B9D981 /* PendingBinaryOperationTests.swift */; };
E2DA4B0B2453C76300B9D981 /* CalculatorIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2DA4B0A2453C76300B9D981 /* CalculatorIntegrationTests.swift */; };
Expand Down Expand Up @@ -140,8 +138,6 @@
E2CBA5172442C3D3008A3097 /* CalculatorButtonProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalculatorButtonProtocol.swift; sourceTree = "<group>"; };
E2CBA51B2442C660008A3097 /* CalculatorButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalculatorButton.swift; sourceTree = "<group>"; };
E2CBA51D2442C7D3008A3097 /* CalculatorBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalculatorBuilder.swift; sourceTree = "<group>"; };
E2CD3AF52B316E8D00B8F955 /* CalculatorTextButtonV2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalculatorTextButtonV2.swift; sourceTree = "<group>"; };
E2CD3AF72B316F0E00B8F955 /* CalculatorImageButtonV2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalculatorImageButtonV2.swift; sourceTree = "<group>"; };
E2DA4B062453BF2100B9D981 /* CalculatorButtonTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalculatorButtonTests.swift; sourceTree = "<group>"; };
E2DA4B082453C25A00B9D981 /* PendingBinaryOperationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PendingBinaryOperationTests.swift; sourceTree = "<group>"; };
E2DA4B0A2453C76300B9D981 /* CalculatorIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalculatorIntegrationTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -226,7 +222,6 @@
E2225F8E29B4621200F4AEDA /* Buttons */ = {
isa = PBXGroup;
children = (
E2CD3AF42B316E8400B8F955 /* V2 */,
E266F255244EA2580009559E /* CalculatorButtonRepresentable.swift */,
E2CBA5172442C3D3008A3097 /* CalculatorButtonProtocol.swift */,
E2CBA51B2442C660008A3097 /* CalculatorButton.swift */,
Expand Down Expand Up @@ -386,15 +381,6 @@
path = Helpers;
sourceTree = "<group>";
};
E2CD3AF42B316E8400B8F955 /* V2 */ = {
isa = PBXGroup;
children = (
E2CD3AF52B316E8D00B8F955 /* CalculatorTextButtonV2.swift */,
E2CD3AF72B316F0E00B8F955 /* CalculatorImageButtonV2.swift */,
);
path = V2;
sourceTree = "<group>";
};
E2D195B229B5AE030069EEC7 /* Operations */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -622,7 +608,6 @@
files = (
E27030F5244970B800955BDF /* DependencyInjectionFactory.swift in Sources */,
E270D7EE27685EB900198B7B /* View+Utilities.swift in Sources */,
E2CD3AF62B316E8D00B8F955 /* CalculatorTextButtonV2.swift in Sources */,
E2CADA87245CC86D0047B314 /* CalculatorDisplayTrimmerProtocol.swift in Sources */,
E2654C6C244D5304005BA7EC /* CalculatorOperationValidatorProtocol.swift in Sources */,
E2CBA5182442C3D3008A3097 /* CalculatorButtonProtocol.swift in Sources */,
Expand All @@ -643,7 +628,6 @@
E201FAC924421A7C00AE6F4C /* CalculatorEnvironmentObject.swift in Sources */,
E2FBCEC42441608600147B1B /* AppDelegate.swift in Sources */,
E2681FD0244BB33F002DB20F /* String+Replacing.swift in Sources */,
E2CD3AF82B316F0E00B8F955 /* CalculatorImageButtonV2.swift in Sources */,
E248B9A925FC5AF800DCFCD8 /* UserDefaultsStorage.swift in Sources */,
E27030EF24494EC500955BDF /* CalculatorOperationHandler.swift in Sources */,
E23B8407249079D700F3ED68 /* View+TypeErasure.swift in Sources */,
Expand Down
29 changes: 0 additions & 29 deletions CalculatorReplicaSwiftUI/Scenes/Calculator/Buttons/V2/CalculatorImageButtonV2.swift
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions CalculatorReplicaSwiftUI/Scenes/Calculator/Buttons/V2/CalculatorTextButtonV2.swift
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion CalculatorReplicaSwiftUITests/CalculatorIntegrationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import XCTest
@testable import Calculator

class CalculatorIntegrationTests: XCTestCase {
final class CalculatorIntegrationTests: XCTestCase {

private var operationHandler: CalculatorOperationHandlerProtocol!

Expand Down
2 changes: 1 addition & 1 deletion CalculatorReplicaSwiftUITests/CalculatorOperationValidatorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import XCTest
@testable import Calculator

class CalculatorOperationValidatorTests: XCTestCase {
final class CalculatorOperationValidatorTests: XCTestCase {

private var validatorToTest: CalculatorOperationValidatorProtocol!
private var mockCalculatorConfiguration: CalculatorConfigurationMock!
Expand Down
2 changes: 1 addition & 1 deletion CalculatorReplicaSwiftUITests/CalculatorResultFormatterTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import XCTest
@testable import Calculator

class CalculatorResultFormatterTests: XCTestCase {
final class CalculatorResultFormatterTests: XCTestCase {

private var formatterToTest: CalculatorResultFormatterProtocol!
private var mockCalculatorConfiguration: CalculatorConfigurationMock!
Expand Down
2 changes: 1 addition & 1 deletion CalculatorReplicaSwiftUITests/PendingBinaryOperationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import XCTest
@testable import Calculator

class PendingBinaryOperationTests: XCTestCase {
final class PendingBinaryOperationTests: XCTestCase {

func testSimpleOperation() {
// Arrange
Expand Down
2 changes: 1 addition & 1 deletion CalculatorReplicaSwiftUITests/StringExtensionTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import XCTest
@testable import Calculator

class StringExtensionTests: XCTestCase {
final class StringExtensionTests: XCTestCase {

func testIntegerDigitsCount() {
// Arrange
Expand Down
Loading