From ea4546591f5bb213e3d2fa54b06f01426e03ad0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihat=20Gu=CC=88ndu=CC=88z?= Date: Wed, 16 Nov 2022 14:00:40 +0900 Subject: [PATCH 1/3] Cleanup BartyCrouch files --- .bartycrouch.toml | 29 ----------------------------- Prayer.xcodeproj/project.pbxproj | 2 -- 2 files changed, 31 deletions(-) delete mode 100644 .bartycrouch.toml diff --git a/.bartycrouch.toml b/.bartycrouch.toml deleted file mode 100644 index eb7486c..0000000 --- a/.bartycrouch.toml +++ /dev/null @@ -1,29 +0,0 @@ -[update] -tasks = ["interfaces", "normalize", "translate", "transform"] - -[update.interfaces] -paths = ["App/Sources"] - -[update.normalize] -paths = ["App/Resources"] -sourceLocale = "en" -harmonizeWithSource = true -sortByKeys = true - -[update.translate] -paths = ["App/Resources"] -secret = "" -sourceLocale = "en" - -[update.transform] -codePaths = ["App/Sources"] -localizablePaths = ["App/Resources"] -transformer = "swiftgenStructured" -supportedLanguageEnumPath = "App/Resources" -typeName = "BartyCrouch" -translateMethodName = "translate" - -[lint] -paths = ["App/Resources"] -duplicateKeys = true -emptyValues = true diff --git a/Prayer.xcodeproj/project.pbxproj b/Prayer.xcodeproj/project.pbxproj index 8db2c43..09f5210 100644 --- a/Prayer.xcodeproj/project.pbxproj +++ b/Prayer.xcodeproj/project.pbxproj @@ -285,7 +285,6 @@ 2E51B4EA276A6A6F001AEEFE /* .env.sample */ = {isa = PBXFileReference; lastKnownFileType = text; path = .env.sample; sourceTree = ""; }; 2E51B4EB276A6A6F001AEEFE /* .github */ = {isa = PBXFileReference; lastKnownFileType = folder; path = .github; sourceTree = ""; }; 2E51B4EC276A6A6F001AEEFE /* swiftgen.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = swiftgen.yml; sourceTree = ""; }; - 2E51B4ED276A6A6F001AEEFE /* .bartycrouch.toml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .bartycrouch.toml; sourceTree = ""; }; 2E51B4EE276A6A6F001AEEFE /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitignore; sourceTree = ""; }; 2E51B4EF276A6A6F001AEEFE /* Swiftgen-xcassets.stencil */ = {isa = PBXFileReference; lastKnownFileType = text; path = "Swiftgen-xcassets.stencil"; sourceTree = ""; }; 2E51B4F0276A6A6F001AEEFE /* Logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Logo.png; sourceTree = ""; }; @@ -499,7 +498,6 @@ 2E51B4E8276A6A39001AEEFE /* RootFiles */ = { isa = PBXGroup; children = ( - 2E51B4ED276A6A6F001AEEFE /* .bartycrouch.toml */, 2E51B4F3276A6A6F001AEEFE /* .env */, 2E51B4EA276A6A6F001AEEFE /* .env.sample */, 2E51B4EB276A6A6F001AEEFE /* .github */, From 127e045bca659ede82fab2321440d57791084d0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihat=20Gu=CC=88ndu=CC=88z?= Date: Wed, 16 Nov 2022 15:11:22 +0900 Subject: [PATCH 2/3] Fix URLs and ReMafoX integration build-script --- App/Generated/ReMafoX.swift | 135 ------------------ .../Settings/SettingsFlowController.swift | 2 +- Prayer.remafox | 1 + Prayer.xcodeproj/project.pbxproj | 2 +- README.md | 2 +- fastlane/Deliverfile | 14 +- fastlane/Fastfile | 3 +- fastlane/metadata/de-DE/description.txt | 2 +- fastlane/metadata/en-US/description.txt | 2 +- fastlane/metadata/tr/description.txt | 2 +- 10 files changed, 14 insertions(+), 151 deletions(-) diff --git a/App/Generated/ReMafoX.swift b/App/Generated/ReMafoX.swift index baeb9aa..120d5fb 100644 --- a/App/Generated/ReMafoX.swift +++ b/App/Generated/ReMafoX.swift @@ -65,104 +65,6 @@ internal enum Res { } } - internal enum Content { - /// 🇺🇸 English: "Hello, world!" - internal enum Greeting { - /// The translated `String` instance. - internal static var string: String { Bundle.main.localizedString(forKey: self.tableLookupKey, value: nil, table: "Localizable") } - - /// The SwiftUI `LocalizedStringKey` instance. - internal static var locStringKey: LocalizedStringKey { LocalizedStringKey(self.tableLookupKey) } - - /// The lookup key in the translation table (= the key in the `.strings` or `.stringsdict` file). - internal static var tableLookupKey: String { "Content.Greeting" } - } - } - - internal enum Hello { - /// 🇺🇸 English: "Hit me baby, one more time!" - internal enum World { - /// The translated `String` instance. - internal static var string: String { Bundle.main.localizedString(forKey: self.tableLookupKey, value: nil, table: "Localizable") } - - /// The SwiftUI `LocalizedStringKey` instance. - internal static var locStringKey: LocalizedStringKey { LocalizedStringKey(self.tableLookupKey) } - - /// The lookup key in the translation table (= the key in the `.strings` or `.stringsdict` file). - internal static var tableLookupKey: String { "Hello.World" } - - /// 🇺🇸 English: "" - internal enum Another { - /// The translated `String` instance. - internal static var string: String { Bundle.main.localizedString(forKey: self.tableLookupKey, value: nil, table: "Localizable") } - - /// The SwiftUI `LocalizedStringKey` instance. - internal static var locStringKey: LocalizedStringKey { LocalizedStringKey(self.tableLookupKey) } - - /// The lookup key in the translation table (= the key in the `.strings` or `.stringsdict` file). - internal static var tableLookupKey: String { "Hello.World.Another" } - } - } - } - - internal enum Inbox { - /// 🇺🇸 English (plural case 'other'): "%d messages" - internal struct Unread { - internal let count: Int - - internal init(count: Int) { - self.count = count - } - - /// The translated `String` instance. - internal var string: String { - let localizedFormatString = Bundle.main.localizedString(forKey: self.tableLookupKey, value: nil, table: "Localizable") - return String.localizedStringWithFormat(localizedFormatString, self.count) - } - - /// The SwiftUI `LocalizedStringKey` instance. - internal var locStringKey: LocalizedStringKey { LocalizedStringKey("Inbox.Unread(count: \(self.count))") } - - /// The lookup key in the translation table (= the key in the `.strings` or `.stringsdict` file). - internal var tableLookupKey: String { "Inbox.Unread(count: %d)" } - } - } - - /// 🇺🇸 English: "sdfasdfasdfafdaf" - internal enum KladsjLjqweopruqwporuqweporuqwelkdsjfAljopqwue { - /// The translated `String` instance. - internal static var string: String { Bundle.main.localizedString(forKey: self.tableLookupKey, value: nil, table: "Localizable") } - - /// The SwiftUI `LocalizedStringKey` instance. - internal static var locStringKey: LocalizedStringKey { LocalizedStringKey(self.tableLookupKey) } - - /// The lookup key in the translation table (= the key in the `.strings` or `.stringsdict` file). - internal static var tableLookupKey: String { "kladsj;ljqweopruqwporuqweporuqwelkdsjf;aljopqwue" } - } - - internal enum Post { - /// 🇺🇸 English (plural case 'other'): "%d likes" - internal struct Likes { - internal let count: Int - - internal init(count: Int) { - self.count = count - } - - /// The translated `String` instance. - internal var string: String { - let localizedFormatString = Bundle.main.localizedString(forKey: self.tableLookupKey, value: nil, table: "Localizable") - return String.localizedStringWithFormat(localizedFormatString, self.count) - } - - /// The SwiftUI `LocalizedStringKey` instance. - internal var locStringKey: LocalizedStringKey { LocalizedStringKey("Post.Likes(count: \(self.count))") } - - /// The lookup key in the translation table (= the key in the `.strings` or `.stringsdict` file). - internal var tableLookupKey: String { "Post.Likes(count: %d)" } - } - } - internal enum PrayerView { internal enum Countdown { /// 🇺🇸 English: "Countdown" @@ -1663,29 +1565,6 @@ internal enum Res { } } - internal enum Some { - /// 🇺🇸 English: "Oh, this is so %@!" - internal struct Key { - internal let count: String - - internal init(count: String) { - self.count = count - } - - /// The translated `String` instance. - internal var string: String { - let localizedFormatString = Bundle.main.localizedString(forKey: self.tableLookupKey, value: nil, table: "Localizable") - return String.localizedStringWithFormat(localizedFormatString, self.count) - } - - /// The SwiftUI `LocalizedStringKey` instance. - internal var locStringKey: LocalizedStringKey { LocalizedStringKey("Some.Key(count: \(self.count))") } - - /// The lookup key in the translation table (= the key in the `.strings` or `.stringsdict` file). - internal var tableLookupKey: String { "Some.Key(count: %@)" } - } - } - internal enum SpeechSynthesizer { /// 🇺🇸 English: "Chapter " internal enum BookEmojiReplacement { @@ -1699,19 +1578,5 @@ internal enum Res { internal static var tableLookupKey: String { "SPEECH_SYNTHESIZER.BOOK_EMOJI_REPLACEMENT" } } } - - internal enum WelcomeBox { - /// 🇺🇸 English: "Welcome to this amazing app!" - internal enum Message { - /// The translated `String` instance. - internal static var string: String { Bundle.main.localizedString(forKey: self.tableLookupKey, value: nil, table: "Localizable") } - - /// The SwiftUI `LocalizedStringKey` instance. - internal static var locStringKey: LocalizedStringKey { LocalizedStringKey(self.tableLookupKey) } - - /// The lookup key in the translation table (= the key in the `.strings` or `.stringsdict` file). - internal static var tableLookupKey: String { "WelcomeBox.Message" } - } - } } } diff --git a/App/Sources/ScreenFlows/Settings/SettingsFlowController.swift b/App/Sources/ScreenFlows/Settings/SettingsFlowController.swift index 6e5ddcd..aeaa9cd 100644 --- a/App/Sources/ScreenFlows/Settings/SettingsFlowController.swift +++ b/App/Sources/ScreenFlows/Settings/SettingsFlowController.swift @@ -131,7 +131,7 @@ extension SettingsFlowController: SettingsFlowDelegate { } func showFeedbackCommunity() { - let communityUrl = URL(string: "https://links.flinesoft.com/forum/prayer")! + let communityUrl = URL(string: "https://github.com/FlineDev/Prayer/discussions")! let safariViewCtrl = SFSafariViewController(url: communityUrl) settingsViewCtrl.present(safariViewCtrl, animated: true, completion: nil) diff --git a/Prayer.remafox b/Prayer.remafox index e863110..a6a060e 100644 --- a/Prayer.remafox +++ b/Prayer.remafox @@ -65,6 +65,7 @@ "enumName" : "Res", "filePath" : "App/Generated/ReMafoX.swift", "indent" : " ", + "objectiveCCompatible" : false, "stringsEnumName" : "Str", "stringsTopLevelAlias" : "L10n", "useSwiftPackagePreviewsWorkaround" : false, diff --git a/Prayer.xcodeproj/project.pbxproj b/Prayer.xcodeproj/project.pbxproj index 09f5210..9ab34ee 100644 --- a/Prayer.xcodeproj/project.pbxproj +++ b/Prayer.xcodeproj/project.pbxproj @@ -1144,7 +1144,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "xattr -d com.apple.quarantine ~/Library/Containers/dev.fline.Remafox/Data/bin/remafox\nexport PATH=\"$PATH:~/Library/Containers/dev.fline.Remafox/Data/bin\"\n\nif which remafox > /dev/null; then\n remafox ibsync -c Prayer.remafox\n remafox normalize -c Prayer.remafox\n remafox translate -c Prayer.remafox\n remafox lint -c Prayer.remafox\n remafox generate -c Prayer.remafox\nelse\n echo \"warning: ReMafoX command line tool not installed, download & setup app from https://remafox.app\"\nfi\n"; + shellScript = "xattr -d com.apple.quarantine $HOME/Library/Containers/dev.fline.Remafox/Data/bin/remafox\nexport PATH=\"$PATH:$HOME/Library/Containers/dev.fline.Remafox/Data/bin\"\n\nif which remafox > /dev/null; then\n remafox ibsync -c Prayer.remafox\n remafox normalize -c Prayer.remafox\n remafox translate -c Prayer.remafox\n remafox lint -c Prayer.remafox\n remafox generate -c Prayer.remafox\nelse\n echo \"warning: ReMafoX command line tool not installed, download & set up app from https://remafox.app\"\nfi\n"; }; A1494BCA1E2ED74700286EBF /* SwiftGen */ = { isa = PBXShellScriptBuildPhase; diff --git a/README.md b/README.md index 7efd72a..232472c 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@

About - • Community Forum + • Community Forum • App Store • Donation • Contributing diff --git a/fastlane/Deliverfile b/fastlane/Deliverfile index 8a45a48..b659f41 100644 --- a/fastlane/Deliverfile +++ b/fastlane/Deliverfile @@ -3,9 +3,9 @@ # https://github.com/fastlane/fastlane/blob/master/deliver/Deliverfile.md keywords( - "en-US" => "Prayer, English, Islam, Muslim", - "de-DE" => "Gebet, Deutsch, Islam, Muslim", - "tr" => "Namaz, Türkçe, Islam, Müslüman" + "en-US" => "Prayer, Pray, English, Islam, Muslim", + "de-DE" => "Gebet, Beten, Deutsch, Islam, Muslim", + "tr" => "Namaz, Dua, Türkçe, Islam, Müslüman" ) copyright "2016-#{Time.now.year} Cihat Gündüz" @@ -17,13 +17,11 @@ name( ) support_url( - "de-DE" => "https://links.flinesoft.com/forum/prayer", - "en-US" => "https://links.flinesoft.com/forum/prayer", - "tr" => "https://links.flinesoft.com/forum/prayer" + "de-DE" => "https://github.com/FlineDev/Prayer/issues", + "en-US" => "https://github.com/FlineDev/Prayer/issues", + "tr" => "https://github.com/FlineDev/Prayer/issues" ) -overwrite_screenshots(true) - phased_release(true) automatic_release(true) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 203433b..2a12548 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -12,6 +12,5 @@ lane :release do snapshot(localize_simulator: true, dark_mode: false) end gym - deliver(force: true) + deliver(force: true, overwrite_screenshots: UI.confirm("Override screenshots?")) end - diff --git a/fastlane/metadata/de-DE/description.txt b/fastlane/metadata/de-DE/description.txt index a32b928..2f793cc 100644 --- a/fastlane/metadata/de-DE/description.txt +++ b/fastlane/metadata/de-DE/description.txt @@ -4,7 +4,7 @@ Diese App hilft dir, deine Gebete auf Deutsch (oder Türkisch bzw. Englisch) zu Diese App setzt voraus, dass du den Ablauf eines Gebets bereits kennst. Für Gebets-Neulinge ist diese App daher nicht geeignet. -Wir hoffen, dass du diese App nützlich findest. Wenn sie dir gefällt, freuen wir uns über eine entsprechende Bewertung im App Store. Für Fragen und Anregungen haben wir ein Forum eingerichtet: links.flinesoft.com/forum/prayer +Wir hoffen, dass du diese App nützlich findest. Wenn sie dir gefällt, freuen wir uns über eine entsprechende Bewertung im App Store. Für Fragen und Anregungen haben wir ein Forum eingerichtet: github.com/FlineDev/Prayer/discussions Dort findest du auch unsere Pläne für die Zukunft und kannst dich an der Diskussion beteiligen. diff --git a/fastlane/metadata/en-US/description.txt b/fastlane/metadata/en-US/description.txt index af9dfa8..bc28d75 100644 --- a/fastlane/metadata/en-US/description.txt +++ b/fastlane/metadata/en-US/description.txt @@ -4,7 +4,7 @@ This app will help you make your prayers in English (or German or Turkish) to ma The app expects that you already know how a prayer is done. Therefore this app is not suitable for newcomers to prayers. -We hope you find this app useful. If you like it, we would love to receive a rating in the App Store. For questions and suggestions, we have set up a forum: links.flinesoft.com/forum/prayer +We hope you find this app useful. If you like it, we would love to receive a rating in the App Store. For questions and suggestions, we have set up a forum: github.com/FlineDev/Prayer/discussions There, you will also find our plans for the future and you can even participate in the discussion. diff --git a/fastlane/metadata/tr/description.txt b/fastlane/metadata/tr/description.txt index 5a04b7a..6ef4408 100644 --- a/fastlane/metadata/tr/description.txt +++ b/fastlane/metadata/tr/description.txt @@ -4,7 +4,7 @@ Bu uygulama Türkçe (veya Almanca yada İngilizce) namaz kılmanıza yardımcı Uygulama, bir duanın nasıl yapıldığını zaten bilmenizi bekler. Bu nedenle bu uygulama namaza yeni başlayanlar için uygun değildir. -Biz bu uygulamanın yararlı bulacağını umuyoruz. Eğer sevdiyseniz, bize App Store'da bir rating yaparsan seviniriz. links. Soru ve önerileriniz için, biz bir forum kurduk: links.flinesoft.com/forum/prayer +Biz bu uygulamanın yararlı bulacağını umuyoruz. Eğer sevdiyseniz, bize App Store'da bir rating yaparsan seviniriz. links. Soru ve önerileriniz için, biz bir forum kurduk: github.com/FlineDev/Prayer/discussions Orada, bu uygulamanın geleceği için planımızı da bulacaksınız ve hatta tartışmaya katılabilirsiniz. From df07a3771bf93fe84d191976c41e9ebfc99d8e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihat=20Gu=CC=88ndu=CC=88z?= Date: Wed, 16 Nov 2022 15:25:58 +0900 Subject: [PATCH 3/3] Finalize new changelog section + make release --- .../Settings/SettingsFlowController.swift | 2 +- App/SupportingFiles/Info.plist | 2 +- CHANGELOG.md | 4 ++++ Prayer.xcodeproj/project.pbxproj | 12 ++++++------ README.md | 4 ++-- fastlane/Fastfile | 5 ++++- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/App/Sources/ScreenFlows/Settings/SettingsFlowController.swift b/App/Sources/ScreenFlows/Settings/SettingsFlowController.swift index aeaa9cd..3277c32 100644 --- a/App/Sources/ScreenFlows/Settings/SettingsFlowController.swift +++ b/App/Sources/ScreenFlows/Settings/SettingsFlowController.swift @@ -131,7 +131,7 @@ extension SettingsFlowController: SettingsFlowDelegate { } func showFeedbackCommunity() { - let communityUrl = URL(string: "https://github.com/FlineDev/Prayer/discussions")! + let communityUrl = URL(string: "https://github.com/FlineDev/Prayer/issues")! let safariViewCtrl = SFSafariViewController(url: communityUrl) settingsViewCtrl.present(safariViewCtrl, animated: true, completion: nil) diff --git a/App/SupportingFiles/Info.plist b/App/SupportingFiles/Info.plist index 130ef14..d9a38a0 100644 --- a/App/SupportingFiles/Info.plist +++ b/App/SupportingFiles/Info.plist @@ -17,7 +17,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - $(CURRENT_PROJECT_VERSION) + 6 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/CHANGELOG.md b/CHANGELOG.md index 87fd0e7..1d488cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,10 @@ If needed, pluralize to `Issues`, `PRs` or `Authors` and list multiple separated ### Security - None. +## [1.4.3] - 2022-11-16 +### Fixed +- Fixed some links to Forums within the app. + ## [1.4.2] - 2022-10-07 ### Changed - Updated dependencies to latest versions. diff --git a/Prayer.xcodeproj/project.pbxproj b/Prayer.xcodeproj/project.pbxproj index 9ab34ee..e251f07 100644 --- a/Prayer.xcodeproj/project.pbxproj +++ b/Prayer.xcodeproj/project.pbxproj @@ -2103,15 +2103,15 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 6; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 767S6EFMJ8; - INFOPLIST_FILE = "$(SRCROOT)/App/SupportingFiles/Info.plist"; + INFOPLIST_FILE = App/SupportingFiles/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.4.2; + MARKETING_VERSION = 1.4.3; PRODUCT_BUNDLE_IDENTIFIER = com.flinesoft.prayer; PRODUCT_MODULE_NAME = App; PRODUCT_NAME = Prayer; @@ -2124,15 +2124,15 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 6; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 767S6EFMJ8; - INFOPLIST_FILE = "$(SRCROOT)/App/SupportingFiles/Info.plist"; + INFOPLIST_FILE = App/SupportingFiles/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.4.2; + MARKETING_VERSION = 1.4.3; PRODUCT_BUNDLE_IDENTIFIER = com.flinesoft.prayer; PRODUCT_MODULE_NAME = App; PRODUCT_NAME = Prayer; diff --git a/README.md b/README.md index 232472c..1086200 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ alt="Build Status"> - Version: 1.4.2 + Version: 1.4.3 Swift: 5.6 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 2a12548..b908064 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -7,10 +7,13 @@ default_platform :ios desc "Deploy a new version to the App Store" lane :release do match(type: "appstore") - if UI.confirm("Take new snapshots?") + increment_build_number(xcodeproj: "Prayer.xcodeproj") if UI.confirm("Increment build number?") + + if UI.confirm("Take new screenshots?") snapshot(localize_simulator: true, dark_mode: true, launch_arguments: "DARK_MODE", clear_previous_screenshots: true) snapshot(localize_simulator: true, dark_mode: false) end + gym deliver(force: true, overwrite_screenshots: UI.confirm("Override screenshots?")) end