diff --git a/Dumb Calculator.xcodeproj/project.pbxproj b/Dumb Calculator.xcodeproj/project.pbxproj index c53b31b..ffcb06f 100644 --- a/Dumb Calculator.xcodeproj/project.pbxproj +++ b/Dumb Calculator.xcodeproj/project.pbxproj @@ -296,7 +296,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.1; + MARKETING_VERSION = 1.0.2; PRODUCT_BUNDLE_IDENTIFIER = "Friedrich-Voelkers.Dumpulator"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -319,7 +319,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.1; + MARKETING_VERSION = 1.0.2; PRODUCT_BUNDLE_IDENTIFIER = "Friedrich-Voelkers.Dumpulator"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; diff --git a/Dumb Calculator.xcodeproj/project.xcworkspace/xcuserdata/friedrichvolkers.xcuserdatad/UserInterfaceState.xcuserstate b/Dumb Calculator.xcodeproj/project.xcworkspace/xcuserdata/friedrichvolkers.xcuserdatad/UserInterfaceState.xcuserstate index 074806a..31e6782 100644 Binary files a/Dumb Calculator.xcodeproj/project.xcworkspace/xcuserdata/friedrichvolkers.xcuserdatad/UserInterfaceState.xcuserstate and b/Dumb Calculator.xcodeproj/project.xcworkspace/xcuserdata/friedrichvolkers.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Dumb Calculator.xcodeproj/xcshareddata/xcschemes/Dumb Calculator.xcscheme b/Dumb Calculator.xcodeproj/xcshareddata/xcschemes/Dumb Calculator.xcscheme index 54b56fd..de2a4d9 100644 --- a/Dumb Calculator.xcodeproj/xcshareddata/xcschemes/Dumb Calculator.xcscheme +++ b/Dumb Calculator.xcodeproj/xcshareddata/xcschemes/Dumb Calculator.xcscheme @@ -31,7 +31,7 @@ - - + + diff --git a/Dumpulator/Info.plist b/Dumpulator/Info.plist index e0ec742..cf1aea2 100644 --- a/Dumpulator/Info.plist +++ b/Dumpulator/Info.plist @@ -44,7 +44,7 @@ UIApplicationSupportsIndirectInputEvents UILaunchStoryboardName - LaunchScreen + Main UIMainStoryboardFile Main UIRequiredDeviceCapabilities diff --git a/Dumpulator/ViewController.swift b/Dumpulator/ViewController.swift index 2dbe610..7c174df 100644 --- a/Dumpulator/ViewController.swift +++ b/Dumpulator/ViewController.swift @@ -280,7 +280,7 @@ class ViewController: UIViewController, MFMailComposeViewControllerDelegate { case "/" : if resultDouble == 0.0 { resetAll() - showAlert(name: "Error!", text: "It is not allowed to divide by zero! The \"Dumpulator\" is reset again.") + showAlert(name: "Error!", text: "It is not allowed to divide by zero! The Dumb Calculator is reset again.") } else { resultDouble = lastNumber / resultDouble resultString = String(resultDouble) @@ -296,7 +296,7 @@ class ViewController: UIViewController, MFMailComposeViewControllerDelegate { updateDisplay(showDecimalpoint: false) default : resetAll() - showAlert(name: "Error!", text: "Incorrect input! The \"Dumpulator\" is reset again.") + showAlert(name: "Error!", text: "Incorrect input! The Dumb Calculator is reset again.") } } @@ -447,7 +447,7 @@ class ViewController: UIViewController, MFMailComposeViewControllerDelegate { } func showInformations() { - let alert = UIAlertController(title: "Information", message: "The project \"Dumpulator\" is an open source project. For further development a pull request can be created in the GitHub repository.", preferredStyle: UIAlertController.Style.alert) + let alert = UIAlertController(title: "Information", message: "The project Dumb Calculator is an open source project. For further development a pull request can be created in the GitHub repository.", preferredStyle: UIAlertController.Style.alert) alert.addAction(UIAlertAction(title: "Back", style: UIAlertAction.Style.default, handler: { _ in} @@ -486,11 +486,11 @@ class ViewController: UIViewController, MFMailComposeViewControllerDelegate { func resetMenu() { resetAll() - showAlert(name: "Info", text: "The \"Dumpulator\" is reset again.") + showAlert(name: "Info", text: "The Dumb Calculator is reset again.") } func visitGitHUb() { - let url = URL(string: "https://github.com/frievoe97/dumpulator") + let url = URL(string: "https://github.com/frievoe97/Dump-Calculator-iOS") let vc = SFSafariViewController(url: url!) present(vc, animated: true) } diff --git a/source/images/AppIcons-3.zip b/source/images/AppIcons-3.zip new file mode 100644 index 0000000..6e4539d Binary files /dev/null and b/source/images/AppIcons-3.zip differ diff --git a/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/1024.png b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/1024.png new file mode 100644 index 0000000..5a5c2e6 Binary files /dev/null and b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/114.png b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/114.png new file mode 100644 index 0000000..dd46f4a Binary files /dev/null and b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/114.png differ diff --git a/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/120.png b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/120.png new file mode 100644 index 0000000..8609cc7 Binary files /dev/null and b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/120.png differ diff --git a/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/180.png b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/180.png new file mode 100644 index 0000000..ac4452e Binary files /dev/null and b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/180.png differ diff --git a/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/29.png b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/29.png new file mode 100644 index 0000000..6ab6682 Binary files /dev/null and b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/29.png differ diff --git a/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/40.png b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/40.png new file mode 100644 index 0000000..9739636 Binary files /dev/null and b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/40.png differ diff --git a/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/57.png b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/57.png new file mode 100644 index 0000000..89feb63 Binary files /dev/null and b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/57.png differ diff --git a/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/58.png b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/58.png new file mode 100644 index 0000000..ff3a4df Binary files /dev/null and b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/58.png differ diff --git a/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/60.png b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/60.png new file mode 100644 index 0000000..e6e62ec Binary files /dev/null and b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/60.png differ diff --git a/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/80.png b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/80.png new file mode 100644 index 0000000..c90b579 Binary files /dev/null and b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/80.png differ diff --git a/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/87.png b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/87.png new file mode 100644 index 0000000..c3ce723 Binary files /dev/null and b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/87.png differ diff --git a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/Contents.json b/source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/Contents.json rename to source/images/AppIcons-3/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/source/images/AppIcons-3/appstore.png b/source/images/AppIcons-3/appstore.png new file mode 100644 index 0000000..5a5c2e6 Binary files /dev/null and b/source/images/AppIcons-3/appstore.png differ diff --git a/source/images/AppIcons-3/playstore.png b/source/images/AppIcons-3/playstore.png new file mode 100644 index 0000000..a3fa649 Binary files /dev/null and b/source/images/AppIcons-3/playstore.png differ diff --git a/source/images/AppIcons.zip b/source/images/AppIcons.zip deleted file mode 100644 index 262e822..0000000 Binary files a/source/images/AppIcons.zip and /dev/null differ diff --git a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/1024.png b/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/1024.png deleted file mode 100644 index 8c0bc71..0000000 Binary files a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/1024.png and /dev/null differ diff --git a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/114.png b/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/114.png deleted file mode 100644 index f636922..0000000 Binary files a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/114.png and /dev/null differ diff --git a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/120.png b/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/120.png deleted file mode 100644 index e6f2eca..0000000 Binary files a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/120.png and /dev/null differ diff --git a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/180.png b/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/180.png deleted file mode 100644 index 6854124..0000000 Binary files a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/180.png and /dev/null differ diff --git a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/29.png b/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/29.png deleted file mode 100644 index 323908e..0000000 Binary files a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/29.png and /dev/null differ diff --git a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/40.png b/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/40.png deleted file mode 100644 index 1521e91..0000000 Binary files a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/40.png and /dev/null differ diff --git a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/57.png b/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/57.png deleted file mode 100644 index b3f41db..0000000 Binary files a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/57.png and /dev/null differ diff --git a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/58.png b/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/58.png deleted file mode 100644 index 5757e44..0000000 Binary files a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/58.png and /dev/null differ diff --git a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/60.png b/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/60.png deleted file mode 100644 index 12fee6c..0000000 Binary files a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/60.png and /dev/null differ diff --git a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/80.png b/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/80.png deleted file mode 100644 index abb7498..0000000 Binary files a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/80.png and /dev/null differ diff --git a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/87.png b/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/87.png deleted file mode 100644 index 37416ed..0000000 Binary files a/source/images/AppIcons/Assets.xcassets/AppIcon.appiconset/87.png and /dev/null differ diff --git a/source/images/AppIcons/appstore.png b/source/images/AppIcons/appstore.png deleted file mode 100644 index 8c0bc71..0000000 Binary files a/source/images/AppIcons/appstore.png and /dev/null differ diff --git a/source/images/AppIcons/playstore.png b/source/images/AppIcons/playstore.png deleted file mode 100644 index d5ef372..0000000 Binary files a/source/images/AppIcons/playstore.png and /dev/null differ diff --git a/source/images/icon.pxm b/source/images/icon.pxm index c6d0478..5153a98 100644 Binary files a/source/images/icon.pxm and b/source/images/icon.pxm differ