From 8c77a0a323b77bc381207dc04fc5114d976525e6 Mon Sep 17 00:00:00 2001 From: Tihanyi Marcell Date: Tue, 26 Dec 2023 13:51:08 +0100 Subject: [PATCH 1/3] Eletem egyszerubbe tetele --- .../ios/Runner.xcodeproj/project.pbxproj | 52 +++---------------- fix-darwin.sh | 26 ++++++++++ 2 files changed, 32 insertions(+), 46 deletions(-) create mode 100755 fix-darwin.sh diff --git a/filcnaplo/ios/Runner.xcodeproj/project.pbxproj b/filcnaplo/ios/Runner.xcodeproj/project.pbxproj index df89d5d..3d7f9b1 100644 --- a/filcnaplo/ios/Runner.xcodeproj/project.pbxproj +++ b/filcnaplo/ios/Runner.xcodeproj/project.pbxproj @@ -17,14 +17,6 @@ 3127F7A828EAEE8500C2EFB3 /* lesson_model.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3127F7A728EAEE8500C2EFB3 /* lesson_model.swift */; }; 373A6ECB5FC71FE9D8AF2EDB /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F0ADD56276103500A3016C8 /* Pods_Runner.framework */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 3B4461282AE6E0FF00AAE6FD /* refilc_default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3B4461202AE6E0FF00AAE6FD /* refilc_default@2x.png */; }; - 3B4461292AE6E0FF00AAE6FD /* refilc_concept@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3B4461212AE6E0FF00AAE6FD /* refilc_concept@2x.png */; }; - 3B44612A2AE6E0FF00AAE6FD /* refilc_concept@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3B4461222AE6E0FF00AAE6FD /* refilc_concept@3x.png */; }; - 3B44612B2AE6E0FF00AAE6FD /* refilc_overcomplicated@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3B4461232AE6E0FF00AAE6FD /* refilc_overcomplicated@2x.png */; }; - 3B44612C2AE6E0FF00AAE6FD /* refilc_default@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3B4461242AE6E0FF00AAE6FD /* refilc_default@3x.png */; }; - 3B44612D2AE6E0FF00AAE6FD /* refilc_overcomplicated@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3B4461252AE6E0FF00AAE6FD /* refilc_overcomplicated@3x.png */; }; - 3B44612E2AE6E0FF00AAE6FD /* refilc_pride@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3B4461262AE6E0FF00AAE6FD /* refilc_pride@2x.png */; }; - 3B44612F2AE6E0FF00AAE6FD /* refilc_pride@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3B4461272AE6E0FF00AAE6FD /* refilc_pride@3x.png */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; @@ -81,14 +73,6 @@ 3127F7A728EAEE8500C2EFB3 /* lesson_model.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = lesson_model.swift; sourceTree = ""; }; 317DE77A294F6FFB002E323E /* livecard.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = livecard.entitlements; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3B4461202AE6E0FF00AAE6FD /* refilc_default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "refilc_default@2x.png"; path = "../../../../../../../../../Downloads/iloveimg-resized/refilc_default@2x.png"; sourceTree = ""; }; - 3B4461212AE6E0FF00AAE6FD /* refilc_concept@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "refilc_concept@2x.png"; path = "../../../../../../../../../Downloads/iloveimg-resized/refilc_concept@2x.png"; sourceTree = ""; }; - 3B4461222AE6E0FF00AAE6FD /* refilc_concept@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "refilc_concept@3x.png"; path = "../../../../../../../../../Downloads/iloveimg-resized (1)/refilc_concept@3x.png"; sourceTree = ""; }; - 3B4461232AE6E0FF00AAE6FD /* refilc_overcomplicated@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "refilc_overcomplicated@2x.png"; path = "../../../../../../../../../Downloads/iloveimg-resized/refilc_overcomplicated@2x.png"; sourceTree = ""; }; - 3B4461242AE6E0FF00AAE6FD /* refilc_default@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "refilc_default@3x.png"; path = "../../../../../../../../../Downloads/iloveimg-resized (1)/refilc_default@3x.png"; sourceTree = ""; }; - 3B4461252AE6E0FF00AAE6FD /* refilc_overcomplicated@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "refilc_overcomplicated@3x.png"; path = "../../../../../../../../../Downloads/iloveimg-resized (1)/refilc_overcomplicated@3x.png"; sourceTree = ""; }; - 3B4461262AE6E0FF00AAE6FD /* refilc_pride@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "refilc_pride@2x.png"; path = "../../../../../../../../../Downloads/iloveimg-resized/refilc_pride@2x.png"; sourceTree = ""; }; - 3B4461272AE6E0FF00AAE6FD /* refilc_pride@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "refilc_pride@3x.png"; path = "../../../../../../../../../Downloads/iloveimg-resized (1)/refilc_pride@3x.png"; sourceTree = ""; }; 707F8089D970F81C480F73C4 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -138,21 +122,6 @@ path = livecard; sourceTree = ""; }; - 3B44611F2AE6DF7200AAE6FD /* App Icons */ = { - isa = PBXGroup; - children = ( - 3B4461212AE6E0FF00AAE6FD /* refilc_concept@2x.png */, - 3B4461222AE6E0FF00AAE6FD /* refilc_concept@3x.png */, - 3B4461202AE6E0FF00AAE6FD /* refilc_default@2x.png */, - 3B4461242AE6E0FF00AAE6FD /* refilc_default@3x.png */, - 3B4461232AE6E0FF00AAE6FD /* refilc_overcomplicated@2x.png */, - 3B4461252AE6E0FF00AAE6FD /* refilc_overcomplicated@3x.png */, - 3B4461262AE6E0FF00AAE6FD /* refilc_pride@2x.png */, - 3B4461272AE6E0FF00AAE6FD /* refilc_pride@3x.png */, - ); - path = "App Icons"; - sourceTree = ""; - }; 6640A963014A9D4F31026053 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -209,7 +178,6 @@ 97C146F01CF9000F007C117D /* Runner */ = { isa = PBXGroup; children = ( - 3B44611F2AE6DF7200AAE6FD /* App Icons */, 3127F73928EAEC3200C2EFB3 /* Runner.entitlements */, 97C146FA1CF9000F007C117D /* Main.storyboard */, 97C146FD1CF9000F007C117D /* Assets.xcassets */, @@ -318,18 +286,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 3B44612A2AE6E0FF00AAE6FD /* refilc_concept@3x.png in Resources */, - 3B44612F2AE6E0FF00AAE6FD /* refilc_pride@3x.png in Resources */, 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, - 3B44612E2AE6E0FF00AAE6FD /* refilc_pride@2x.png in Resources */, 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, - 3B44612C2AE6E0FF00AAE6FD /* refilc_default@3x.png in Resources */, - 3B4461292AE6E0FF00AAE6FD /* refilc_concept@2x.png in Resources */, - 3B4461282AE6E0FF00AAE6FD /* refilc_default@2x.png in Resources */, - 3B44612D2AE6E0FF00AAE6FD /* refilc_overcomplicated@3x.png in Resources */, - 3B44612B2AE6E0FF00AAE6FD /* refilc_overcomplicated@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -549,7 +509,7 @@ CODE_SIGN_ENTITLEMENTS = livecard/livecard.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 238; DEVELOPMENT_TEAM = 4DKAF249F3; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -563,7 +523,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 4.5.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.refilc2.naplo.livecardpro; @@ -591,7 +551,7 @@ CODE_SIGN_ENTITLEMENTS = livecard/livecard.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 238; DEVELOPMENT_TEAM = 4DKAF249F3; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -605,7 +565,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 4.5.1; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.refilc2.naplo.livecardpro; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -631,7 +591,7 @@ CODE_SIGN_ENTITLEMENTS = livecard/livecard.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 238; DEVELOPMENT_TEAM = 4DKAF249F3; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -645,7 +605,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 4.5.1; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.refilc2.naplo.livecardpro; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/fix-darwin.sh b/fix-darwin.sh new file mode 100755 index 0000000..a4c501e --- /dev/null +++ b/fix-darwin.sh @@ -0,0 +1,26 @@ +cd ./filcnaplo +flutter clean +flutter pub get +cd .. + +cd ./filcnaplo_kreta_api +flutter clean +flutter pub get +cd .. + +cd ./filcnaplo_mobile_ui +flutter clean +flutter pub get +cd .. + +cd ./filcnaplo_desktop_ui +flutter clean +flutter pub get +cd .. + +cd ./filcnaplo_premium +flutter clean +flutter pub get +cd .. + +echo Fixed pub. \ No newline at end of file From 5b3c47fa1909037c6a573597b06247e7bfb85cb7 Mon Sep 17 00:00:00 2001 From: cemrk2 Date: Mon, 29 Jan 2024 18:13:22 +0100 Subject: [PATCH 2/3] Fixed card title being italic when renamedSubjectsItalics is false --- filcnaplo_mobile_ui/lib/pages/home/live_card/live_card.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filcnaplo_mobile_ui/lib/pages/home/live_card/live_card.dart b/filcnaplo_mobile_ui/lib/pages/home/live_card/live_card.dart index 078b583..a4cf682 100755 --- a/filcnaplo_mobile_ui/lib/pages/home/live_card/live_card.dart +++ b/filcnaplo_mobile_ui/lib/pages/home/live_card/live_card.dart @@ -173,7 +173,7 @@ class LiveCardStateA extends State { title: liveCard.currentLesson!.subject.renamedTo ?? liveCard.currentLesson!.subject.name.capital(), titleItalic: liveCard.currentLesson!.subject.isRenamed && - settingsProvider.renamedSubjectsEnabled, + settingsProvider.renamedSubjectsItalics, subtitle: liveCard.currentLesson!.room, icon: SubjectIcon.resolveVariant( subject: liveCard.currentLesson!.subject, context: context), From 66431ef7d3edc52cf9eb97fe1683d53d39824196 Mon Sep 17 00:00:00 2001 From: cemrk2 Date: Mon, 29 Jan 2024 20:05:18 +0100 Subject: [PATCH 3/3] Added renamedSubjectsEnabled check to titleItalic and nextSubjectItalic --- filcnaplo_mobile_ui/lib/pages/home/live_card/live_card.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/filcnaplo_mobile_ui/lib/pages/home/live_card/live_card.dart b/filcnaplo_mobile_ui/lib/pages/home/live_card/live_card.dart index a4cf682..76026b9 100755 --- a/filcnaplo_mobile_ui/lib/pages/home/live_card/live_card.dart +++ b/filcnaplo_mobile_ui/lib/pages/home/live_card/live_card.dart @@ -173,6 +173,7 @@ class LiveCardStateA extends State { title: liveCard.currentLesson!.subject.renamedTo ?? liveCard.currentLesson!.subject.name.capital(), titleItalic: liveCard.currentLesson!.subject.isRenamed && + settingsProvider.renamedSubjectsEnabled && settingsProvider.renamedSubjectsItalics, subtitle: liveCard.currentLesson!.room, icon: SubjectIcon.resolveVariant( @@ -183,6 +184,7 @@ class LiveCardStateA extends State { nextSubject: liveCard.nextLesson?.subject.renamedTo ?? liveCard.nextLesson?.subject.name.capital(), nextSubjectItalic: liveCard.nextLesson?.subject.isRenamed == true && + settingsProvider.renamedSubjectsEnabled && settingsProvider.renamedSubjectsItalics, nextRoom: liveCard.nextLesson?.room, progressMax: showMinutes ? maxTime / 60 : maxTime,