diff --git a/Graduately.xcworkspace/contents.xcworkspacedata b/Graduately.xcworkspace/contents.xcworkspacedata index ce429e1..a223309 100644 --- a/Graduately.xcworkspace/contents.xcworkspacedata +++ b/Graduately.xcworkspace/contents.xcworkspacedata @@ -2,9 +2,9 @@ + location = "group:ios/Graduately.xcodeproj"> + location = "group:macos/Graduately.xcodeproj"> diff --git a/README.md b/README.md index 131a1b0..2f44081 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ cd Graduately Na Macu: ```bash -open Maturita.xcworkspace # scheme Maturita z macos/Maturita.xcodeproj +open Graduately.xcworkspace # scheme Graduately z macos/Graduately.xcodeproj # nebo: make bundle # zip v dist/graduately-macos-arm64.zip ``` @@ -185,15 +185,14 @@ jednou odinstalujte a nainstalujte znovu. iOS ze zdroje (Xcode 26, iOS 26+ / Liquid Glass): ```bash -open Maturita.xcworkspace # v kořeni repozitáře +open Graduately.xcworkspace # v kořeni repozitáře # Simulátor: vyber iPhone a Run, nic dalšího není potřeba (obsah se # vytáhne z C zdrojů při buildu). Na iPhone: v Signing vyber svůj Team. # nebo: make ios # unsigned IPA v dist-ios/graduately-ios.ipa ``` -Workspace odkazuje na `ios/Maturita.xcodeproj` a `macos/Maturita.xcodeproj`. -Projekty nepřesouvejte – build čte `../src` a `../scripts` a v kořeni by -`Maturita/` kolidovalo se zkompilovaným binárem `graduately`. +Workspace odkazuje na `ios/Graduately.xcodeproj` a `macos/Graduately.xcodeproj`. +Projekty nepřesouvejte – build čte `../src` a `../scripts`. Licence: [GPL-3.0](LICENSE). @@ -299,7 +298,7 @@ cd Graduately On a Mac: ```bash -open Maturita.xcworkspace # scheme Maturita from macos/Maturita.xcodeproj +open Graduately.xcworkspace # scheme Graduately from macos/Graduately.xcodeproj # or: make bundle # zip at dist/graduately-macos-arm64.zip ``` @@ -379,14 +378,13 @@ signature – uninstall once and install again. iOS from source (Xcode 26, iOS 26+ / Liquid Glass): ```bash -open Maturita.xcworkspace # at the repo root +open Graduately.xcworkspace # at the repo root # Simulator: pick an iPhone and Run, nothing else needed (content is # extracted from the C sources during the build). Device: pick your Team. # or: make ios # unsigned IPA at dist-ios/graduately-ios.ipa ``` -The workspace points at `ios/Maturita.xcodeproj` and `macos/Maturita.xcodeproj`. -Do not move the projects – the build reads `../src` and `../scripts`, and at -the root `Maturita/` would collide with the compiled `maturita` binary. +The workspace points at `ios/Graduately.xcodeproj` and `macos/Graduately.xcodeproj`. +Do not move the projects – the build reads `../src` and `../scripts`. License: [GPL-3.0](LICENSE). diff --git a/ios/Graduately.xcodeproj/project.pbxproj b/ios/Graduately.xcodeproj/project.pbxproj index f58f174..f06208d 100644 --- a/ios/Graduately.xcodeproj/project.pbxproj +++ b/ios/Graduately.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - A101000000000000000001 /* MaturitaApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = A201000000000000000001 /* MaturitaApp.swift */; }; + A101000000000000000001 /* GraduatelyApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = A201000000000000000001 /* GraduatelyApp.swift */; }; A101000000000000000002 /* AppModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A201000000000000000002 /* AppModel.swift */; }; A101000000000000000003 /* Route.swift in Sources */ = {isa = PBXBuildFile; fileRef = A201000000000000000003 /* Route.swift */; }; A101000000000000000004 /* JSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = A201000000000000000004 /* JSON.swift */; }; @@ -26,7 +26,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - A201000000000000000001 /* MaturitaApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MaturitaApp.swift; sourceTree = ""; }; + A201000000000000000001 /* GraduatelyApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GraduatelyApp.swift; sourceTree = ""; }; A201000000000000000002 /* AppModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppModel.swift; sourceTree = ""; }; A201000000000000000003 /* Route.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Route.swift; sourceTree = ""; }; A201000000000000000004 /* JSON.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSON.swift; sourceTree = ""; }; @@ -60,15 +60,15 @@ A501000000000000000001 = { isa = PBXGroup; children = ( - A501000000000000000002 /* Maturita */, + A501000000000000000002 /* Graduately */, A501000000000000000006 /* Products */, ); sourceTree = ""; }; - A501000000000000000002 /* Maturita */ = { + A501000000000000000002 /* Graduately */ = { isa = PBXGroup; children = ( - A201000000000000000001 /* MaturitaApp.swift */, + A201000000000000000001 /* GraduatelyApp.swift */, A201000000000000000002 /* AppModel.swift */, A201000000000000000003 /* Route.swift */, A501000000000000000003 /* Data */, @@ -77,7 +77,7 @@ A201000000000000000016 /* Assets.xcassets */, A201000000000000000018 /* Info.plist */, ); - path = Maturita; + path = Graduately; sourceTree = ""; }; A501000000000000000003 /* Data */ = { @@ -124,9 +124,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - A601000000000000000001 /* Maturita */ = { + A601000000000000000001 /* Graduately */ = { isa = PBXNativeTarget; - buildConfigurationList = A801000000000000000002 /* Build configuration list for PBXNativeTarget "Maturita" */; + buildConfigurationList = A801000000000000000002 /* Build configuration list for PBXNativeTarget "Graduately" */; buildPhases = ( A701000000000000000001 /* Sources */, A401000000000000000001 /* Frameworks */, @@ -137,7 +137,7 @@ ); dependencies = ( ); - name = Maturita; + name = Graduately; productName = Graduately; productReference = A301000000000000000001 /* Graduately.app */; productType = "com.apple.product-type.application"; @@ -157,7 +157,7 @@ }; }; }; - buildConfigurationList = A801000000000000000001 /* Build configuration list for PBXProject "Maturita" */; + buildConfigurationList = A801000000000000000001 /* Build configuration list for PBXProject "Graduately" */; compatibilityVersion = "Xcode 14.0"; developmentRegion = cs; hasScannedForEncodings = 0; @@ -171,7 +171,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - A601000000000000000001 /* Maturita */, + A601000000000000000001 /* Graduately */, ); }; /* End PBXProject section */ @@ -216,7 +216,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - A101000000000000000001 /* MaturitaApp.swift in Sources */, + A101000000000000000001 /* GraduatelyApp.swift in Sources */, A101000000000000000002 /* AppModel.swift in Sources */, A101000000000000000003 /* Route.swift in Sources */, A101000000000000000004 /* JSON.swift in Sources */, @@ -346,7 +346,7 @@ DEVELOPMENT_TEAM = C2U9S337H8; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = Maturita/Info.plist; + INFOPLIST_FILE = Graduately/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Graduately; INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education"; @@ -359,7 +359,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.1; + MARKETING_VERSION = 0.2; PRODUCT_BUNDLE_IDENTIFIER = com.bukovinafilip.maturita; PRODUCT_NAME = Graduately; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -384,7 +384,7 @@ DEVELOPMENT_TEAM = C2U9S337H8; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = Maturita/Info.plist; + INFOPLIST_FILE = Graduately/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Graduately; INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education"; @@ -397,7 +397,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.1; + MARKETING_VERSION = 0.2; PRODUCT_BUNDLE_IDENTIFIER = com.bukovinafilip.maturita; PRODUCT_NAME = Graduately; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -413,7 +413,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - A801000000000000000001 /* Build configuration list for PBXProject "Maturita" */ = { + A801000000000000000001 /* Build configuration list for PBXProject "Graduately" */ = { isa = XCConfigurationList; buildConfigurations = ( A901000000000000000001 /* Debug */, @@ -422,7 +422,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A801000000000000000002 /* Build configuration list for PBXNativeTarget "Maturita" */ = { + A801000000000000000002 /* Build configuration list for PBXNativeTarget "Graduately" */ = { isa = XCConfigurationList; buildConfigurations = ( A901000000000000000003 /* Debug */, diff --git a/ios/Graduately.xcodeproj/xcshareddata/xcschemes/Graduately.xcscheme b/ios/Graduately.xcodeproj/xcshareddata/xcschemes/Graduately.xcscheme index f9c480d..9cd60f4 100644 --- a/ios/Graduately.xcodeproj/xcshareddata/xcschemes/Graduately.xcscheme +++ b/ios/Graduately.xcodeproj/xcshareddata/xcschemes/Graduately.xcscheme @@ -16,8 +16,8 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "A601000000000000000001" BuildableName = "Graduately.app" - BlueprintName = "Maturita" - ReferencedContainer = "container:Maturita.xcodeproj"> + BlueprintName = "Graduately" + ReferencedContainer = "container:Graduately.xcodeproj"> @@ -46,8 +46,8 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "A601000000000000000001" BuildableName = "Graduately.app" - BlueprintName = "Maturita" - ReferencedContainer = "container:Maturita.xcodeproj"> + BlueprintName = "Graduately" + ReferencedContainer = "container:Graduately.xcodeproj"> @@ -64,8 +64,8 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "A601000000000000000001" BuildableName = "Graduately.app" - BlueprintName = "Maturita" - ReferencedContainer = "container:Maturita.xcodeproj"> + BlueprintName = "Graduately" + ReferencedContainer = "container:Graduately.xcodeproj"> diff --git a/ios/Graduately/AppModel.swift b/ios/Graduately/AppModel.swift index a2686f8..37968b8 100644 --- a/ios/Graduately/AppModel.swift +++ b/ios/Graduately/AppModel.swift @@ -22,7 +22,7 @@ final class AppModel: ObservableObject { lang = progress.lang showChangelog = !content.changelog.isEmpty && !sameBuild(AppConfig.commit, progress.seenCommit) #if DEBUG - // `xcrun simctl launch org.maturita.maturita -route u1e3` opens a page for screenshots. + // `xcrun simctl launch com.bukovinafilip.maturita -route u1e3` opens a page for screenshots. if let page = UserDefaults.standard.string(forKey: "route"), let r = routeFromPage(page) { openFromSearch(r.page) } diff --git a/ios/Graduately/GraduatelyApp.swift b/ios/Graduately/GraduatelyApp.swift index e92d0dc..d622722 100644 --- a/ios/Graduately/GraduatelyApp.swift +++ b/ios/Graduately/GraduatelyApp.swift @@ -1,7 +1,7 @@ import SwiftUI @main -struct MaturitaApp: App { +struct GraduatelyApp: App { @StateObject private var vm = AppModel() var body: some Scene { diff --git a/macos/Graduately.xcodeproj/project.pbxproj b/macos/Graduately.xcodeproj/project.pbxproj index 3993112..0fbfebc 100644 --- a/macos/Graduately.xcodeproj/project.pbxproj +++ b/macos/Graduately.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - B101000000000000000001 /* MaturitaApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = B201000000000000000001 /* MaturitaApp.swift */; }; + B101000000000000000001 /* GraduatelyApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = B201000000000000000001 /* GraduatelyApp.swift */; }; B101000000000000000002 /* Platform.swift in Sources */ = {isa = PBXBuildFile; fileRef = B201000000000000000002 /* Platform.swift */; }; B101000000000000000003 /* Updater.swift in Sources */ = {isa = PBXBuildFile; fileRef = B201000000000000000003 /* Updater.swift */; }; B101000000000000000004 /* AppModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B201000000000000000004 /* AppModel.swift */; }; @@ -27,25 +27,25 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - B201000000000000000001 /* MaturitaApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MaturitaApp.swift; sourceTree = ""; }; + B201000000000000000001 /* GraduatelyApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GraduatelyApp.swift; sourceTree = ""; }; B201000000000000000002 /* Platform.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Platform.swift; sourceTree = ""; }; B201000000000000000003 /* Updater.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Updater.swift; sourceTree = ""; }; - B201000000000000000004 /* AppModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppModel.swift; path = ../ios/Maturita/AppModel.swift; sourceTree = SOURCE_ROOT; }; - B201000000000000000005 /* Route.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Route.swift; path = ../ios/Maturita/Route.swift; sourceTree = SOURCE_ROOT; }; - B201000000000000000006 /* JSON.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = JSON.swift; path = ../ios/Maturita/Data/JSON.swift; sourceTree = SOURCE_ROOT; }; - B201000000000000000007 /* Content.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Content.swift; path = ../ios/Maturita/Data/Content.swift; sourceTree = SOURCE_ROOT; }; - B201000000000000000008 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Theme.swift; path = ../ios/Maturita/Data/Theme.swift; sourceTree = SOURCE_ROOT; }; - B201000000000000000009 /* Answers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Answers.swift; path = ../ios/Maturita/Data/Answers.swift; sourceTree = SOURCE_ROOT; }; - B201000000000000000010 /* ProgressStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ProgressStore.swift; path = ../ios/Maturita/Data/ProgressStore.swift; sourceTree = SOURCE_ROOT; }; - B201000000000000000011 /* Components.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Components.swift; path = ../ios/Maturita/UI/Components.swift; sourceTree = SOURCE_ROOT; }; - B201000000000000000012 /* Icons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Icons.swift; path = ../ios/Maturita/UI/Icons.swift; sourceTree = SOURCE_ROOT; }; - B201000000000000000013 /* Screens.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Screens.swift; path = ../ios/Maturita/UI/Screens.swift; sourceTree = SOURCE_ROOT; }; - B201000000000000000014 /* Exercises.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Exercises.swift; path = ../ios/Maturita/UI/Exercises.swift; sourceTree = SOURCE_ROOT; }; - B201000000000000000015 /* ExercisesMore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ExercisesMore.swift; path = ../ios/Maturita/UI/ExercisesMore.swift; sourceTree = SOURCE_ROOT; }; + B201000000000000000004 /* AppModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppModel.swift; path = ../ios/Graduately/AppModel.swift; sourceTree = SOURCE_ROOT; }; + B201000000000000000005 /* Route.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Route.swift; path = ../ios/Graduately/Route.swift; sourceTree = SOURCE_ROOT; }; + B201000000000000000006 /* JSON.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = JSON.swift; path = ../ios/Graduately/Data/JSON.swift; sourceTree = SOURCE_ROOT; }; + B201000000000000000007 /* Content.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Content.swift; path = ../ios/Graduately/Data/Content.swift; sourceTree = SOURCE_ROOT; }; + B201000000000000000008 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Theme.swift; path = ../ios/Graduately/Data/Theme.swift; sourceTree = SOURCE_ROOT; }; + B201000000000000000009 /* Answers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Answers.swift; path = ../ios/Graduately/Data/Answers.swift; sourceTree = SOURCE_ROOT; }; + B201000000000000000010 /* ProgressStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ProgressStore.swift; path = ../ios/Graduately/Data/ProgressStore.swift; sourceTree = SOURCE_ROOT; }; + B201000000000000000011 /* Components.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Components.swift; path = ../ios/Graduately/UI/Components.swift; sourceTree = SOURCE_ROOT; }; + B201000000000000000012 /* Icons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Icons.swift; path = ../ios/Graduately/UI/Icons.swift; sourceTree = SOURCE_ROOT; }; + B201000000000000000013 /* Screens.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Screens.swift; path = ../ios/Graduately/UI/Screens.swift; sourceTree = SOURCE_ROOT; }; + B201000000000000000014 /* Exercises.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Exercises.swift; path = ../ios/Graduately/UI/Exercises.swift; sourceTree = SOURCE_ROOT; }; + B201000000000000000015 /* ExercisesMore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ExercisesMore.swift; path = ../ios/Graduately/UI/ExercisesMore.swift; sourceTree = SOURCE_ROOT; }; B201000000000000000016 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; B201000000000000000017 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - B201000000000000000018 /* Maturita.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Maturita.entitlements; sourceTree = ""; }; - B201000000000000000019 /* PathMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PathMap.swift; path = ../ios/Maturita/UI/PathMap.swift; sourceTree = SOURCE_ROOT; }; + B201000000000000000018 /* Graduately.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Graduately.entitlements; sourceTree = ""; }; + B201000000000000000019 /* PathMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PathMap.swift; path = ../ios/Graduately/UI/PathMap.swift; sourceTree = SOURCE_ROOT; }; B301000000000000000001 /* Graduately.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Graduately.app; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -63,15 +63,15 @@ B501000000000000000001 = { isa = PBXGroup; children = ( - B501000000000000000002 /* Maturita */, + B501000000000000000002 /* Graduately */, B501000000000000000006 /* Products */, ); sourceTree = ""; }; - B501000000000000000002 /* Maturita */ = { + B501000000000000000002 /* Graduately */ = { isa = PBXGroup; children = ( - B201000000000000000001 /* MaturitaApp.swift */, + B201000000000000000001 /* GraduatelyApp.swift */, B201000000000000000002 /* Platform.swift */, B201000000000000000004 /* AppModel.swift */, B201000000000000000005 /* Route.swift */, @@ -80,9 +80,9 @@ B501000000000000000005 /* UI */, B201000000000000000016 /* Assets.xcassets */, B201000000000000000017 /* Info.plist */, - B201000000000000000018 /* Maturita.entitlements */, + B201000000000000000018 /* Graduately.entitlements */, ); - path = Maturita; + path = Graduately; sourceTree = ""; }; B501000000000000000003 /* Data */ = { @@ -129,9 +129,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - B601000000000000000001 /* Maturita */ = { + B601000000000000000001 /* Graduately */ = { isa = PBXNativeTarget; - buildConfigurationList = B801000000000000000002 /* Build configuration list for PBXNativeTarget "Maturita" */; + buildConfigurationList = B801000000000000000002 /* Build configuration list for PBXNativeTarget "Graduately" */; buildPhases = ( B701000000000000000001 /* Sources */, B401000000000000000001 /* Frameworks */, @@ -142,7 +142,7 @@ ); dependencies = ( ); - name = Maturita; + name = Graduately; productName = Graduately; productReference = B301000000000000000001 /* Graduately.app */; productType = "com.apple.product-type.application"; @@ -162,7 +162,7 @@ }; }; }; - buildConfigurationList = B801000000000000000001 /* Build configuration list for PBXProject "Maturita" */; + buildConfigurationList = B801000000000000000001 /* Build configuration list for PBXProject "Graduately" */; compatibilityVersion = "Xcode 14.0"; developmentRegion = cs; hasScannedForEncodings = 0; @@ -176,7 +176,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - B601000000000000000001 /* Maturita */, + B601000000000000000001 /* Graduately */, ); }; /* End PBXProject section */ @@ -221,7 +221,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - B101000000000000000001 /* MaturitaApp.swift in Sources */, + B101000000000000000001 /* GraduatelyApp.swift in Sources */, B101000000000000000002 /* Platform.swift in Sources */, B101000000000000000003 /* Updater.swift in Sources */, B101000000000000000004 /* AppModel.swift in Sources */, @@ -343,7 +343,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = Maturita/Maturita.entitlements; + CODE_SIGN_ENTITLEMENTS = Graduately/Graduately.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COMMIT = dev; @@ -352,7 +352,7 @@ ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = Maturita/Info.plist; + INFOPLIST_FILE = Graduately/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Graduately; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education"; INFOPLIST_KEY_NSHighResolutionCapable = YES; @@ -362,7 +362,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 26.0; - MARKETING_VERSION = 0.1; + MARKETING_VERSION = 0.2; PRODUCT_BUNDLE_IDENTIFIER = com.bukovinafilip.maturita.macos; PRODUCT_NAME = Graduately; SDKROOT = macosx; @@ -377,7 +377,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = Maturita/Maturita.entitlements; + CODE_SIGN_ENTITLEMENTS = Graduately/Graduately.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COMMIT = dev; @@ -386,7 +386,7 @@ ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = Maturita/Info.plist; + INFOPLIST_FILE = Graduately/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Graduately; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education"; INFOPLIST_KEY_NSHighResolutionCapable = YES; @@ -396,7 +396,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 26.0; - MARKETING_VERSION = 0.1; + MARKETING_VERSION = 0.2; PRODUCT_BUNDLE_IDENTIFIER = com.bukovinafilip.maturita.macos; PRODUCT_NAME = Graduately; SDKROOT = macosx; @@ -409,7 +409,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - B801000000000000000001 /* Build configuration list for PBXProject "Maturita" */ = { + B801000000000000000001 /* Build configuration list for PBXProject "Graduately" */ = { isa = XCConfigurationList; buildConfigurations = ( B901000000000000000001 /* Debug */, @@ -418,7 +418,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - B801000000000000000002 /* Build configuration list for PBXNativeTarget "Maturita" */ = { + B801000000000000000002 /* Build configuration list for PBXNativeTarget "Graduately" */ = { isa = XCConfigurationList; buildConfigurations = ( B901000000000000000003 /* Debug */, diff --git a/macos/Graduately.xcodeproj/xcshareddata/xcschemes/Graduately.xcscheme b/macos/Graduately.xcodeproj/xcshareddata/xcschemes/Graduately.xcscheme index ca48394..58bd4d5 100644 --- a/macos/Graduately.xcodeproj/xcshareddata/xcschemes/Graduately.xcscheme +++ b/macos/Graduately.xcodeproj/xcshareddata/xcschemes/Graduately.xcscheme @@ -16,8 +16,8 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "B601000000000000000001" BuildableName = "Graduately.app" - BlueprintName = "Maturita" - ReferencedContainer = "container:Maturita.xcodeproj"> + BlueprintName = "Graduately" + ReferencedContainer = "container:Graduately.xcodeproj"> @@ -46,8 +46,8 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "B601000000000000000001" BuildableName = "Graduately.app" - BlueprintName = "Maturita" - ReferencedContainer = "container:Maturita.xcodeproj"> + BlueprintName = "Graduately" + ReferencedContainer = "container:Graduately.xcodeproj"> @@ -64,8 +64,8 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "B601000000000000000001" BuildableName = "Graduately.app" - BlueprintName = "Maturita" - ReferencedContainer = "container:Maturita.xcodeproj"> + BlueprintName = "Graduately" + ReferencedContainer = "container:Graduately.xcodeproj"> diff --git a/macos/Graduately/GraduatelyApp.swift b/macos/Graduately/GraduatelyApp.swift index c8b7c4a..a65f366 100644 --- a/macos/Graduately/GraduatelyApp.swift +++ b/macos/Graduately/GraduatelyApp.swift @@ -1,7 +1,7 @@ import SwiftUI @main -struct MaturitaApp: App { +struct GraduatelyApp: App { @StateObject private var vm = AppModel() var body: some Scene { diff --git a/scripts/bundle-ios.sh b/scripts/bundle-ios.sh index a2daf31..deb3fa9 100755 --- a/scripts/bundle-ios.sh +++ b/scripts/bundle-ios.sh @@ -15,8 +15,8 @@ rm -rf "$root/ios/Payload" mkdir -p "$dd" "$root/dist-ios" xcodebuild \ - -project ios/Maturita.xcodeproj \ - -scheme Maturita \ + -project ios/Graduately.xcodeproj \ + -scheme Graduately \ -configuration Release \ -sdk iphoneos \ -destination 'generic/platform=iOS' \ diff --git a/scripts/bundle-macos-swift.sh b/scripts/bundle-macos-swift.sh index 22cee45..9a8a27c 100755 --- a/scripts/bundle-macos-swift.sh +++ b/scripts/bundle-macos-swift.sh @@ -31,8 +31,8 @@ out_zip="graduately-macos-${arch_tag}.zip" mkdir -p "$dd" "$root/dist" xcodebuild \ - -project macos/Maturita.xcodeproj \ - -scheme Maturita \ + -project macos/Graduately.xcodeproj \ + -scheme Graduately \ -configuration Release \ -destination "generic/platform=macOS" \ -derivedDataPath "$dd" \ @@ -50,7 +50,7 @@ dest="$root/dist/Graduately.app" rm -rf "$dest" cp -R "$app" "$dest" -ENTITLEMENTS="$root/macos/Maturita/Maturita.entitlements" +ENTITLEMENTS="$root/macos/Graduately/Graduately.entitlements" pick_sign_identity() { if [ -n "${MACOS_SIGN_IDENTITY:-}" ]; then diff --git a/scripts/extract-android-content.py b/scripts/extract-android-content.py index 124eff2..fe66ca7 100644 --- a/scripts/extract-android-content.py +++ b/scripts/extract-android-content.py @@ -1389,7 +1389,7 @@ def main() -> int: # Quiz + plot packs for the GTK stub pages (shared by every catalog book). ex_lines = [ "/* Generated from data/cetba JSON packs – do not edit by hand. */", - "/* Requires LitQ (cetba.c) and AssemblyItem (maturita.h). */", + "/* Requires LitQ (cetba.c) and AssemblyItem (graduately.h). */", "", "typedef struct {", " const LitQ *qs;", diff --git a/src/cetba.c b/src/cetba.c index e4ff3b2..def5085 100644 --- a/src/cetba.c +++ b/src/cetba.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" /* ------------------------------------------------------------------ */ /* Maturitní četba: George Orwell – 1984 */ diff --git a/src/changelog.c b/src/changelog.c index 80aef26..39435bd 100644 --- a/src/changelog.c +++ b/src/changelog.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" #include diff --git a/src/czech.c b/src/czech.c index 28036ad..59507bb 100644 --- a/src/czech.c +++ b/src/czech.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" /* ---- Czech language and literature (Český jazyk a literatura) ----- */ diff --git a/src/exercise_common.c b/src/exercise_common.c index fa93fce..1e59e3e 100644 --- a/src/exercise_common.c +++ b/src/exercise_common.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" /* ------------------------------------------------------------------ */ /* Exercise page shell */ diff --git a/src/exercise_u1.c b/src/exercise_u1.c index c4e757e..6155710 100644 --- a/src/exercise_u1.c +++ b/src/exercise_u1.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" /* ------------------------------------------------------------------ */ /* Choice exercises (3 + 9) */ diff --git a/src/exercise_u2.c b/src/exercise_u2.c index 4fd8c3c..0c6d2a2 100644 --- a/src/exercise_u2.c +++ b/src/exercise_u2.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" /* ------------------------------------------------------------------ */ /* Unit 2 exercises ("Aus aller Welt") */ diff --git a/src/exercise_u3.c b/src/exercise_u3.c index cf71ab6..ea09fed 100644 --- a/src/exercise_u3.c +++ b/src/exercise_u3.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" /* ------------------------------------------------------------------ */ /* Unit 3 exercises ("Bei uns zu Hause") */ diff --git a/src/globals.c b/src/globals.c index c93c53a..59db94d 100644 --- a/src/globals.c +++ b/src/globals.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" GtkStack *main_stack; diff --git a/src/graduately.h b/src/graduately.h index c8a339b..39a1b16 100644 --- a/src/graduately.h +++ b/src/graduately.h @@ -1,5 +1,5 @@ -#ifndef MATURITA_H -#define MATURITA_H +#ifndef GRADUATELY_H +#define GRADUATELY_H #include #include @@ -1314,4 +1314,4 @@ void macos_set_dock_icon(const char *path); void activate(GtkApplication *app, gpointer user_data); int main(int argc, char **argv); -#endif /* MATURITA_H */ +#endif /* GRADUATELY_H */ diff --git a/src/hw.c b/src/hw.c index d857ad5..2029953 100644 --- a/src/hw.c +++ b/src/hw.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" /* ---- Technical equipment (Technické vybavení) --------------------- */ diff --git a/src/i18n.c b/src/i18n.c index c20ccfa..9811bc0 100644 --- a/src/i18n.c +++ b/src/i18n.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" /* ------------------------------------------------------------------ */ /* i18n */ diff --git a/src/icons.c b/src/icons.c index 4fab0a7..81201ae 100644 --- a/src/icons.c +++ b/src/icons.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" /* Vector icons drawn with cairo so they never depend on the system * icon theme (which is missing on some installs). */ diff --git a/src/macos_dock.c b/src/macos_dock.c index d95a905..ed7dbea 100644 --- a/src/macos_dock.c +++ b/src/macos_dock.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" #ifdef __APPLE__ #include diff --git a/src/main.c b/src/main.c index 897e494..221dc99 100644 --- a/src/main.c +++ b/src/main.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" /* ------------------------------------------------------------------ */ /* Activate */ diff --git a/src/mluvnice.c b/src/mluvnice.c index d424adc..30454ae 100644 --- a/src/mluvnice.c +++ b/src/mluvnice.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" #define MLUV_N_EX 20 #define MLUV_MAX_BLANK 5 diff --git a/src/navigation.c b/src/navigation.c index 16f58e1..2be7922 100644 --- a/src/navigation.c +++ b/src/navigation.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" /* ------------------------------------------------------------------ */ /* Navigation */ diff --git a/src/net.c b/src/net.c index 2ce0551..b308be0 100644 --- a/src/net.c +++ b/src/net.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" /* ---- Computer networks: subject path, lesson & exercise ------------ */ diff --git a/src/progress.c b/src/progress.c index 79061f3..684a55c 100644 --- a/src/progress.c +++ b/src/progress.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" /* ------------------------------------------------------------------ */ /* Progress */ diff --git a/src/roadmap.c b/src/roadmap.c index aed42c4..008ede0 100644 --- a/src/roadmap.c +++ b/src/roadmap.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" /* ------------------------------------------------------------------ */ /* Roadmap page */ diff --git a/src/search.c b/src/search.c index 46345b1..cdebf03 100644 --- a/src/search.c +++ b/src/search.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" #include #include diff --git a/src/settings.c b/src/settings.c index 248fb9e..b951b3d 100644 --- a/src/settings.c +++ b/src/settings.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" /* ------------------------------------------------------------------ */ /* Settings */ diff --git a/src/stats.c b/src/stats.c index 648756b..fa82e8d 100644 --- a/src/stats.c +++ b/src/stats.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" /* ------------------------------------------------------------------ */ /* Statistics */ diff --git a/src/subjects.c b/src/subjects.c index de191a5..eee9946 100644 --- a/src/subjects.c +++ b/src/subjects.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" /* ------------------------------------------------------------------ */ /* Subjects page — icon grid, one tile per subject */ diff --git a/src/theme.c b/src/theme.c index 5f91940..72ec89b 100644 --- a/src/theme.c +++ b/src/theme.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" Rgb color_from_hex(unsigned int hex) { Rgb c; diff --git a/src/unitmap.c b/src/unitmap.c index 7bee57f..7f8498f 100644 --- a/src/unitmap.c +++ b/src/unitmap.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" /* ------------------------------------------------------------------ */ /* Unit 1 exercise path (roadmap-style serpentine) */ diff --git a/src/update.c b/src/update.c index 1045a08..1f75eb0 100644 --- a/src/update.c +++ b/src/update.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" #include @@ -196,7 +196,7 @@ static gboolean same_commit(const char *a, const char *b) { return ok; } -/* Packaged builds carry a source commit; see APP_COMMIT in maturita.h. */ +/* Packaged builds carry a source commit; see APP_COMMIT in graduately.h. */ static gboolean is_published_build(void) { return g_ascii_isxdigit(APP_COMMIT[0]) && strlen(APP_COMMIT) >= 7; } diff --git a/src/util.c b/src/util.c index 728d2fa..d4804cf 100644 --- a/src/util.c +++ b/src/util.c @@ -1,4 +1,4 @@ -#include "maturita.h" +#include "graduately.h" #ifdef _WIN32 #include @@ -123,7 +123,7 @@ static char *macos_resources_dir(const char *exe) { return resources; } -/* Directory next to Foo.app when exe is .../Foo.app/Contents/MacOS/maturita. */ +/* Directory next to Foo.app when exe is .../Foo.app/Contents/MacOS/Graduately. */ static char *macos_app_parent_dir(const char *exe) { char *macos_dir; char *contents;