Merge branch 'release/1.4.3' into versions

Author: Jeehut

.bartycrouch.toml

@@ -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" }
-         }
-      }
    }
 }

App/Generated/ReMafoX.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/issues")!
       let safariViewCtrl = SFSafariViewController(url: communityUrl)
 
       settingsViewCtrl.present(safariViewCtrl, animated: true, completion: nil)

App/Sources/ScreenFlows/Settings/SettingsFlowController.swift

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<string>6</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

App/SupportingFiles/Info.plist

@@ -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.

CHANGELOG.md

@@ -65,6 +65,7 @@
     "enumName" : "Res",
     "filePath" : "App/Generated/ReMafoX.swift",
     "indent" : "   ",
+    "objectiveCCompatible" : false,
     "stringsEnumName" : "Str",
     "stringsTopLevelAlias" : "L10n",
     "useSwiftPackagePreviewsWorkaround" : false,

Prayer.remafox

@@ -285,7 +285,6 @@
 		2E51B4EA276A6A6F001AEEFE /* .env.sample */ = {isa = PBXFileReference; lastKnownFileType = text; path = .env.sample; sourceTree = "<group>"; };
 		2E51B4EB276A6A6F001AEEFE /* .github */ = {isa = PBXFileReference; lastKnownFileType = folder; path = .github; sourceTree = "<group>"; };
 		2E51B4EC276A6A6F001AEEFE /* swiftgen.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = swiftgen.yml; sourceTree = "<group>"; };
-		2E51B4ED276A6A6F001AEEFE /* .bartycrouch.toml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .bartycrouch.toml; sourceTree = "<group>"; };
 		2E51B4EE276A6A6F001AEEFE /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
 		2E51B4EF276A6A6F001AEEFE /* Swiftgen-xcassets.stencil */ = {isa = PBXFileReference; lastKnownFileType = text; path = "Swiftgen-xcassets.stencil"; sourceTree = "<group>"; };
 		2E51B4F0276A6A6F001AEEFE /* Logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Logo.png; sourceTree = "<group>"; };
@@ -499,7 +498,6 @@
 		2E51B4E8276A6A39001AEEFE /* RootFiles */ = {
 			isa = PBXGroup;
 			children = (
-				2E51B4ED276A6A6F001AEEFE /* .bartycrouch.toml */,
 				2E51B4F3276A6A6F001AEEFE /* .env */,
 				2E51B4EA276A6A6F001AEEFE /* .env.sample */,
 				2E51B4EB276A6A6F001AEEFE /* .github */,
@@ -1146,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;
@@ -2105,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;
@@ -2126,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;

Prayer.xcodeproj/project.pbxproj

@@ -9,8 +9,8 @@
              alt="Build Status">
     </a>
     <a href="https://github.com/FlineDev/Prayer/releases">
-        <img src="https://img.shields.io/badge/Version-1.4.2-blue.svg"
-             alt="Version: 1.4.2">
+        <img src="https://img.shields.io/badge/Version-1.4.3-blue.svg"
+             alt="Version: 1.4.3">
     </a>
     <img src="https://img.shields.io/badge/Swift-5.6-FFAC45.svg"
          alt="Swift: 5.6">
@@ -37,7 +37,7 @@
 
 <p align="center">
     <a href="#about">About</a>
-  • <a href="https://links.flinesoft.com/forum/prayer">Community Forum</a>
+  • <a href="https://github.com/FlineDev/Prayer/discussions">Community Forum</a>
   • <a href="https://itunes.apple.com/us/app/prayer-in-english/id1217136884">App Store</a>
   • <a href="#donation">Donation</a>
   • <a href="#contributing">Contributing</a>

README.md

@@ -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)

fastlane/Deliverfile

@@ -7,11 +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)
+  deliver(force: true, overwrite_screenshots: UI.confirm("Override screenshots?"))
 end
-

fastlane/Fastfile

@@ -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.
 
 

fastlane/metadata/de-DE/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.
 
 

fastlane/metadata/en-US/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.