From 5b6331b69554af3e8ccf9803da66cefe8cbd3c9d Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Tue, 18 Jan 2022 17:17:21 +0300 Subject: [PATCH] ! --- GradeMapper (iOS).entitlements | 10 ++ GradeMapper.xcodeproj/project.pbxproj | 125 ++---------------- .../xcdebugger/Breakpoints_v2.xcbkptlist | 18 --- LICENSE | 21 +++ README.md | 3 + Shared/SubjectView.swift | 2 +- 6 files changed, 43 insertions(+), 136 deletions(-) create mode 100644 GradeMapper (iOS).entitlements create mode 100644 LICENSE create mode 100644 README.md diff --git a/GradeMapper (iOS).entitlements b/GradeMapper (iOS).entitlements new file mode 100644 index 0000000..ee95ab7 --- /dev/null +++ b/GradeMapper (iOS).entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.network.client + + + diff --git a/GradeMapper.xcodeproj/project.pbxproj b/GradeMapper.xcodeproj/project.pbxproj index f6fe4d3..8912e99 100644 --- a/GradeMapper.xcodeproj/project.pbxproj +++ b/GradeMapper.xcodeproj/project.pbxproj @@ -8,22 +8,18 @@ /* Begin PBXBuildFile section */ 4F7E91CD279615A200CB18B7 /* SubjectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F7E91CC279615A200CB18B7 /* SubjectView.swift */; }; - 4F7E91CE279615A200CB18B7 /* SubjectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F7E91CC279615A200CB18B7 /* SubjectView.swift */; }; 4FEB3F0F2795DFE90005C604 /* GradeMapperApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FEB3EFF2795DFE80005C604 /* GradeMapperApp.swift */; }; - 4FEB3F102795DFE90005C604 /* GradeMapperApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FEB3EFF2795DFE80005C604 /* GradeMapperApp.swift */; }; 4FEB3F112795DFE90005C604 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FEB3F002795DFE80005C604 /* ContentView.swift */; }; - 4FEB3F122795DFE90005C604 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FEB3F002795DFE80005C604 /* ContentView.swift */; }; 4FEB3F132795DFE90005C604 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4FEB3F012795DFE90005C604 /* Assets.xcassets */; }; - 4FEB3F142795DFE90005C604 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4FEB3F012795DFE90005C604 /* Assets.xcassets */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 4F7E91CC279615A200CB18B7 /* SubjectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubjectView.swift; sourceTree = ""; }; + 4FD40DBC279702A900A5A6D2 /* GradeMapper (iOS).entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "GradeMapper (iOS).entitlements"; sourceTree = ""; }; 4FEB3EFF2795DFE80005C604 /* GradeMapperApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GradeMapperApp.swift; sourceTree = ""; }; 4FEB3F002795DFE80005C604 /* ContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; 4FEB3F012795DFE90005C604 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 4FEB3F062795DFE90005C604 /* GradeMapper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GradeMapper.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 4FEB3F0C2795DFE90005C604 /* GradeMapper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GradeMapper.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4FEB3F0E2795DFE90005C604 /* macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = macOS.entitlements; sourceTree = ""; }; /* End PBXFileReference section */ @@ -35,19 +31,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4FEB3F092795DFE90005C604 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ 4FEB3EF92795DFE80005C604 = { isa = PBXGroup; children = ( + 4FD40DBC279702A900A5A6D2 /* GradeMapper (iOS).entitlements */, 4FEB3EFE2795DFE80005C604 /* Shared */, 4FEB3F0D2795DFE90005C604 /* macOS */, 4FEB3F072795DFE90005C604 /* Products */, @@ -69,7 +59,6 @@ isa = PBXGroup; children = ( 4FEB3F062795DFE90005C604 /* GradeMapper.app */, - 4FEB3F0C2795DFE90005C604 /* GradeMapper.app */, ); name = Products; sourceTree = ""; @@ -102,23 +91,6 @@ productReference = 4FEB3F062795DFE90005C604 /* GradeMapper.app */; productType = "com.apple.product-type.application"; }; - 4FEB3F0B2795DFE90005C604 /* GradeMapper (macOS) */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4FEB3F1A2795DFE90005C604 /* Build configuration list for PBXNativeTarget "GradeMapper (macOS)" */; - buildPhases = ( - 4FEB3F082795DFE90005C604 /* Sources */, - 4FEB3F092795DFE90005C604 /* Frameworks */, - 4FEB3F0A2795DFE90005C604 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "GradeMapper (macOS)"; - productName = "GradeMapper (macOS)"; - productReference = 4FEB3F0C2795DFE90005C604 /* GradeMapper.app */; - productType = "com.apple.product-type.application"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -132,9 +104,6 @@ 4FEB3F052795DFE90005C604 = { CreatedOnToolsVersion = 13.2.1; }; - 4FEB3F0B2795DFE90005C604 = { - CreatedOnToolsVersion = 13.2.1; - }; }; }; buildConfigurationList = 4FEB3EFD2795DFE80005C604 /* Build configuration list for PBXProject "GradeMapper" */; @@ -151,7 +120,6 @@ projectRoot = ""; targets = ( 4FEB3F052795DFE90005C604 /* GradeMapper (iOS) */, - 4FEB3F0B2795DFE90005C604 /* GradeMapper (macOS) */, ); }; /* End PBXProject section */ @@ -165,14 +133,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4FEB3F0A2795DFE90005C604 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4FEB3F142795DFE90005C604 /* Assets.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -186,16 +146,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4FEB3F082795DFE90005C604 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4FEB3F122795DFE90005C604 /* ContentView.swift in Sources */, - 4F7E91CE279615A200CB18B7 /* SubjectView.swift in Sources */, - 4FEB3F102795DFE90005C604 /* GradeMapperApp.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ @@ -315,6 +265,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_ENTITLEMENTS = "GradeMapper (iOS).entitlements"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = F5PQ7AR4DP; @@ -334,6 +285,8 @@ PRODUCT_BUNDLE_IDENTIFIER = com.ivabus.GradeMapper; PRODUCT_NAME = GradeMapper; SDKROOT = iphoneos; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -345,6 +298,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_ENTITLEMENTS = "GradeMapper (iOS).entitlements"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = F5PQ7AR4DP; @@ -364,6 +318,8 @@ PRODUCT_BUNDLE_IDENTIFIER = com.ivabus.GradeMapper; PRODUCT_NAME = GradeMapper; SDKROOT = iphoneos; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -371,62 +327,6 @@ }; name = Release; }; - 4FEB3F1B2795DFE90005C604 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = macOS/macOS.entitlements; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = F5PQ7AR4DP; - ENABLE_HARDENED_RUNTIME = YES; - ENABLE_PREVIEWS = YES; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - MACOSX_DEPLOYMENT_TARGET = 12.1; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.ivabus.GradeMapper; - PRODUCT_NAME = GradeMapper; - SDKROOT = macosx; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - }; - name = Debug; - }; - 4FEB3F1C2795DFE90005C604 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = macOS/macOS.entitlements; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = F5PQ7AR4DP; - ENABLE_HARDENED_RUNTIME = YES; - ENABLE_PREVIEWS = YES; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - MACOSX_DEPLOYMENT_TARGET = 12.1; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.ivabus.GradeMapper; - PRODUCT_NAME = GradeMapper; - SDKROOT = macosx; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -448,15 +348,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4FEB3F1A2795DFE90005C604 /* Build configuration list for PBXNativeTarget "GradeMapper (macOS)" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4FEB3F1B2795DFE90005C604 /* Debug */, - 4FEB3F1C2795DFE90005C604 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 4FEB3EFA2795DFE80005C604 /* Project object */; diff --git a/GradeMapper.xcodeproj/xcuserdata/ivabus.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/GradeMapper.xcodeproj/xcuserdata/ivabus.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 05fa294..6df4a0c 100644 --- a/GradeMapper.xcodeproj/xcuserdata/ivabus.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/GradeMapper.xcodeproj/xcuserdata/ivabus.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -3,22 +3,4 @@ uuid = "1FA12096-94D4-4153-9D70-423E3C4922F7" type = "1" version = "2.0"> - - - - - - diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e247d06 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2022 dilatedeyes + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..aeff411 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# GradeMapper +Программа для подсчёта среднего взвешенного оценок. Используются веса из Электронного журнала. +И да, даже не спрашивайте, как мы их получили. diff --git a/Shared/SubjectView.swift b/Shared/SubjectView.swift index 28df52f..f88ac91 100644 --- a/Shared/SubjectView.swift +++ b/Shared/SubjectView.swift @@ -54,7 +54,7 @@ struct SubjectView: View { print(ow.multiplier) self.srr = ow.sr }.buttonStyle(.borderedProminent) - Text(String(self.srr)) + Text(String("Средний балл: \(self.srr)")) .fontWeight(.bold) } .padding(.top, -155.0)