Merge branch 'release/1.3.0' into versions

Author: Jeehut

.github/workflows/pull_request.yml

@@ -15,7 +15,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   tests:
-    runs-on: macOS-latest
+    runs-on: macos-11
 
     steps:
       - uses: actions/checkout@v2

.periphery.yml

@@ -3,7 +3,7 @@
   "lineBreakBeforeControlFlowKeywords": true,
   "lineBreakBeforeEachArgument": true,
   "lineBreakBeforeEachGenericRequirement": true,
-  "lineLength": 120,
+  "lineLength": 140,
   "prioritizeKeepingFunctionOutputTogether": true,
   "rules": {
     "NeverUseImplicitlyUnwrappedOptionals": false,

.projlint.yml

@@ -7,7 +7,6 @@
   import UIKit.UIImage
 #endif
 
-// MARK: - Asset Catalogs
 
 internal typealias Colors = Asset.Colors
 internal typealias Images = Asset.Images
@@ -27,6 +26,5 @@ internal enum Asset {
   }
 }
 
-// MARK: - Implementation Details
 
 private final class BundleToken {}

.swift-format

@@ -11,6 +11,17 @@ import Foundation
 // swiftlint:disable nesting type_body_length type_name vertical_whitespace_opening_braces
 internal enum L10n {
 
+  internal enum AudioMode {
+    /// Sound for position changes
+    internal static let movementSound = L10n.tr("Localizable", "AUDIO_MODE.MOVEMENT_SOUND")
+    /// Both (sound + voice)
+    internal static let movementSoundAndSpeechSynthesizer = L10n.tr("Localizable", "AUDIO_MODE.MOVEMENT_SOUND_AND_SPEECH_SYNTHESIZER")
+    /// No audio (muted)
+    internal static let `none` = L10n.tr("Localizable", "AUDIO_MODE.NONE")
+    /// Reading computer voice
+    internal static let speechSynthesizer = L10n.tr("Localizable", "AUDIO_MODE.SPEECH_SYNTHESIZER")
+  }
+
   internal enum PrayerView {
     internal enum Countdown {
       /// Countdown
@@ -176,13 +187,51 @@ internal enum L10n {
     /// Settings
     internal static let title = L10n.tr("Localizable", "SETTINGS.TITLE")
     internal enum AppSection {
+      /// The language of the app determines the language of the texts shown during a prayer. Apple provides an app-specific language setting in the Settings app. Please use it to change the language of this app and the prayers.
+      internal static let footer = L10n.tr("Localizable", "SETTINGS.APP_SECTION.FOOTER")
       /// App Settings
       internal static let title = L10n.tr("Localizable", "SETTINGS.APP_SECTION.TITLE")
       internal enum ChangeLanguageButton {
-        /// Change app language in ⚙️ Settings app
+        /// Change language in ⚙️ Settings
         internal static let title = L10n.tr("Localizable", "SETTINGS.APP_SECTION.CHANGE_LANGUAGE_BUTTON.TITLE")
       }
     }
+    internal enum Audio {
+      internal enum OutputDevice {
+        /// Select output device (via AirPlay icon):
+        internal static let title = L10n.tr("Localizable", "SETTINGS.AUDIO.OUTPUT_DEVICE.TITLE")
+      }
+      internal enum SpeechSynthesizer {
+        /// Pitch multiplicator
+        internal static let pitchMultiplier = L10n.tr("Localizable", "SETTINGS.AUDIO.SPEECH_SYNTHESIZER.PITCH_MULTIPLIER")
+        /// Speech rate
+        internal static let speechRate = L10n.tr("Localizable", "SETTINGS.AUDIO.SPEECH_SYNTHESIZER.SPEECH_RATE")
+        /// Voice
+        internal static let voice = L10n.tr("Localizable", "SETTINGS.AUDIO.SPEECH_SYNTHESIZER.VOICE")
+      }
+    }
+    internal enum AudioSpeedSection {
+      /// Choose one of the two available audio modes, or both or none. The first only plays a short sound when changing positions during a prayer. The second will instead read out loud the full prayer text so you can just listen. This also works when the device is locked in your pocket. This can for example be useful when you want to do your prayers in your preferred language without others in the same Prayer room noticing it.
+      internal static let footer = L10n.tr("Localizable", "SETTINGS.AUDIO_SPEED_SECTION.FOOTER")
+      /// Audio & Speed Settings
+      internal static let title = L10n.tr("Localizable", "SETTINGS.AUDIO_SPEED_SECTION.TITLE")
+      internal enum AudioMode {
+        /// Audio Mode
+        internal static let title = L10n.tr("Localizable", "SETTINGS.AUDIO_SPEED_SECTION.AUDIO_MODE.TITLE")
+      }
+      internal enum ChangingText {
+        /// Quran sura speed
+        internal static let title = L10n.tr("Localizable", "SETTINGS.AUDIO_SPEED_SECTION.CHANGING_TEXT.TITLE")
+      }
+      internal enum FixedTexts {
+        /// Other texts speed
+        internal static let title = L10n.tr("Localizable", "SETTINGS.AUDIO_SPEED_SECTION.FIXED_TEXTS.TITLE")
+      }
+      internal enum MovementSoundInstrument {
+        /// Movement sound
+        internal static let title = L10n.tr("Localizable", "SETTINGS.AUDIO_SPEED_SECTION.MOVEMENT_SOUND_INSTRUMENT.TITLE")
+      }
+    }
     internal enum ChangeMovementSoundSheet {
       /// Choose movement instrument
       internal static let title = L10n.tr("Localizable", "SETTINGS.CHANGE_MOVEMENT_SOUND_SHEET.TITLE")
@@ -201,7 +250,7 @@ internal enum L10n {
         /// 1. Becoming aware of what you are actually saying when you pray.
         /// 2. Use the regular prayers to read the Quran.
         /// 
-        /// Currently the app contains only the last twelve surahs of the Quran and randomly selects between them while one is staying during a prayer, but this is only the first step. With updates we are to follow all the missing surahs, and we also have a planned solution for longer surahs so that you can read them bit by bit to be able to pray and understand them without losing context.
+        /// Currently the app contains only the last 24 surahs of the Quran and randomly selects between them while one is staying during a prayer, but this is only the first step. With updates we are to follow all the missing surahs, and we also have a solution for longer surahs so that you can read them bit by bit to be able to pray and understand them without losing context.
         /// 
         /// Specifically NOT the purpose of this app is to teach praying from the ground up. Knowledge of the fundamentals of the prayers is already assumed, the app is intended primarily to move from doing your prayers in a foreign language (Arabic) to a language which you already mastered (currently: English, German and Turkish).
         internal static let answer = L10n.tr("Localizable", "SETTINGS.FAQ_ENTRIES.APP_MOTIVATION.ANSWER")
@@ -211,7 +260,7 @@ internal enum L10n {
       internal enum IpadReading {
         /// In the end, this can only be answered by God, but we would like to ask all critics the following question: Are the prayers valid if you do not understand the meaning of your spoken words?
         internal static let answer = L10n.tr("Localizable", "SETTINGS.FAQ_ENTRIES.IPAD_READING.ANSWER")
-        /// Are the prayers valid at all, if I read from the iPad?
+        /// Are the prayers valid at all, if I read or listen to a voice?
         internal static let question = L10n.tr("Localizable", "SETTINGS.FAQ_ENTRIES.IPAD_READING.QUESTION")
       }
       internal enum Language {
@@ -222,26 +271,22 @@ internal enum L10n {
         /// Do prayers not have to be spoken in Arabic, the original language of the Koran?
         internal static let question = L10n.tr("Localizable", "SETTINGS.FAQ_ENTRIES.LANGUAGE.QUESTION")
       }
-      internal enum LanguageMix {
-        /// Actually this app is meant to be able to get away from the Arabic language, if you did not master it. An alternative usage method would be to use the app as a supplement to prayers in Arabic, in order to be able to read the meaning next to it. Because we are convinced that prayers are all about meaning, we advise against it to not make the prayers unnecessarily complicated, but for some, this may be the only acceptable way what we can understand. We recommend setting the "Changing text name" setting for this application method.
-        internal static let answer = L10n.tr("Localizable", "SETTINGS.FAQ_ENTRIES.LANGUAGE_MIX.ANSWER")
-        /// Can I also use the app if I want to continue to pray in Arabic?
-        internal static let question = L10n.tr("Localizable", "SETTINGS.FAQ_ENTRIES.LANGUAGE_MIX.QUESTION")
-      }
       internal enum TranslationProblem {
         /// We understand that regular prayers are something so important that you want to do everything as correct as possible. We also understand that in religion many different opinions about the meaning of the same text prevail, and it is important that you remain as close as possible to the original text.
         /// 
-        /// This is why we absolutely want you to read the Quran yourself, not the narratives and traditions of those who have studied the Quran for years and try to enlighten you (supposedly), and above all not those who try to teach you about "the real message of the Koran". We are convinced that this distinction is only possible if you read the Quran for yourself what this App tries to help with.
+        /// This is why we absolutely want you to read the Quran yourself, not the narratives and traditions of those who have studied the Quran for years and try to enlighten you (supposedly), and above all not those who try to teach you about "the real message of the Koran". We are convinced that one can make distinction only if one reads the Quran for oneself what this App tries to help with.
         internal static let answer = L10n.tr("Localizable", "SETTINGS.FAQ_ENTRIES.TRANSLATION_PROBLEM.ANSWER")
         /// Do translations not necessarily change the meaning of the original text?
         internal static let question = L10n.tr("Localizable", "SETTINGS.FAQ_ENTRIES.TRANSLATION_PROBLEM.QUESTION")
       }
     }
     internal enum FeedbackButton {
-      /// Send Feedback
+      /// Feedback
       internal static let title = L10n.tr("Localizable", "SETTINGS.FEEDBACK_BUTTON.TITLE")
     }
     internal enum PrayerSection {
+      /// You can decide, if the name of the changing Quran recitation while standing should be displayed before showing its contents. You can also allow for up to four times longer Quran recitations while standing. Most Quranic surahs are even too long for that, to include them into your prayers, you have to allow splitting them – the app will remember the spliting position and continue from where you left off on the next prayer.
+      internal static let footer = L10n.tr("Localizable", "SETTINGS.PRAYER_SECTION.FOOTER")
       /// Prayer Settings
       internal static let title = L10n.tr("Localizable", "SETTINGS.PRAYER_SECTION.TITLE")
       internal enum AllowLongerRecitations {
@@ -251,25 +296,13 @@ internal enum L10n {
         internal static let title = L10n.tr("Localizable", "SETTINGS.PRAYER_SECTION.ALLOW_LONGER_RECITATIONS.TITLE")
       }
       internal enum AllowSplittingRecitations {
-        /// Include long surah by splitting them
+        /// Split & include lon surah
         internal static let title = L10n.tr("Localizable", "SETTINGS.PRAYER_SECTION.ALLOW_SPLITTING_RECITATIONS.TITLE")
       }
-      internal enum ChangingText {
-        /// Quran sura speed
-        internal static let title = L10n.tr("Localizable", "SETTINGS.PRAYER_SECTION.CHANGING_TEXT.TITLE")
-      }
       internal enum ChangingTextName {
-        /// Quran sura name
+        /// Show Quran sura name
         internal static let title = L10n.tr("Localizable", "SETTINGS.PRAYER_SECTION.CHANGING_TEXT_NAME.TITLE")
       }
-      internal enum FixedTexts {
-        /// Other texts speed
-        internal static let title = L10n.tr("Localizable", "SETTINGS.PRAYER_SECTION.FIXED_TEXTS.TITLE")
-      }
-      internal enum MovementSoundInstrument {
-        /// Movement sound
-        internal static let title = L10n.tr("Localizable", "SETTINGS.PRAYER_SECTION.MOVEMENT_SOUND_INSTRUMENT.TITLE")
-      }
       internal enum RakatCount {
         /// Rakat count
         internal static let title = L10n.tr("Localizable", "SETTINGS.PRAYER_SECTION.RAKAT_COUNT.TITLE")
@@ -280,6 +313,11 @@ internal enum L10n {
       internal static let title = L10n.tr("Localizable", "SETTINGS.START_BUTTON.TITLE")
     }
   }
+
+  internal enum SpeechSynthesizer {
+    /// Chapter 
+    internal static let bookEmojiReplacement = L10n.tr("Localizable", "SPEECH_SYNTHESIZER.BOOK_EMOJI_REPLACEMENT")
+  }
 }
 // swiftlint:enable explicit_type_interface function_parameter_count identifier_name line_length
 // swiftlint:enable nesting type_body_length type_name vertical_whitespace_opening_braces

App/Generated/SwiftGen/Assets.swift

@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.600",
-          "green" : "0.522",
-          "red" : "0.302"
+          "blue" : "0xCC",
+          "green" : "0xC2",
+          "red" : "0xA6"
         }
       },
       "idiom" : "universal"