Merge branch 'quokkaKyu-master'

Author: Alexey Naumov

CountriesSwiftUI/System/SystemEventsHandler.swift

@@ -24,7 +24,7 @@ struct RealSystemEventsHandler: SystemEventsHandler {
     let deepLinksHandler: DeepLinksHandler
     let pushNotificationsHandler: PushNotificationsHandler
     let pushTokenWebRepository: PushTokenWebRepository
-    private var cancelBag = CancelBag()
+    private let cancelBag = CancelBag()
 
     init(container: DIContainer,
          deepLinksHandler: DeepLinksHandler,

CountriesSwiftUI/UI/Components/DetailRow.swift

@@ -9,8 +9,8 @@
 import SwiftUI
 
 struct DetailRow: View {
-    let leftLabel: Text
-    let rightLabel: Text
+    private let leftLabel: Text
+    private let rightLabel: Text
 
     init(leftLabel: Text, rightLabel: Text) {
         self.leftLabel = leftLabel

CountriesSwiftUI/UI/Components/ImageView.swift

@@ -11,7 +11,7 @@ import Combine
 
 struct ImageView: View {
 
-    let imageURL: URL
+    private let imageURL: URL
     @Environment(\.injected) var injected: DIContainer
     @State private var image: Loadable<UIImage>
     let inspection = Inspection<Self>()

CountriesSwiftUI/UI/Components/SearchBar.swift

@@ -31,7 +31,7 @@ struct SearchBar: UIViewRepresentable {
 extension SearchBar {
     final class Coordinator: NSObject, UISearchBarDelegate {
 
-        let text: Binding<String>
+        private let text: Binding<String>
 
         init(text: Binding<String>) {
             self.text = text

CountriesSwiftUI/UI/Screens/ContentView.swift

@@ -32,7 +32,7 @@ struct ContentView: View {
         }
     }
 
-    var onChangeHandler: (EnvironmentValues.Diff) -> Void {
+    private var onChangeHandler: (EnvironmentValues.Diff) -> Void {
         return { diff in
             if !diff.isDisjoint(with: [.locale, .sizeCategory]) {
                 self.container.appState[\.routing] = AppState.ViewRouting()

CountriesSwiftUI/UI/Screens/CountriesList.swift

@@ -22,7 +22,7 @@ struct CountriesList: View {
     @Environment(\.locale) private var locale: Locale
     private let localeContainer = LocaleReader.Container()
 
-    let inspection = Inspection<Self>()
+    private let inspection = Inspection<Self>()
 
     init(countries: Loadable<LazyList<Country>> = .notRequested) {
         self._countries = .init(initialValue: countries)
@@ -199,15 +199,15 @@ extension CountriesList {
 
 private extension CountriesList {
 
-    var routingUpdate: AnyPublisher<Routing, Never> {
+    private var routingUpdate: AnyPublisher<Routing, Never> {
         injected.appState.updates(for: \.routing.countriesList)
     }
 
-    var keyboardHeightUpdate: AnyPublisher<CGFloat, Never> {
+    private var keyboardHeightUpdate: AnyPublisher<CGFloat, Never> {
         injected.appState.updates(for: \.system.keyboardHeight)
     }
 
-    var canRequestPushPermissionUpdate: AnyPublisher<Bool, Never> {
+    private var canRequestPushPermissionUpdate: AnyPublisher<Bool, Never> {
         injected.appState.updates(for: AppState.permissionKeyPath(for: .pushNotifications))
             .map { $0 == .notRequested || $0 == .denied }
             .eraseToAnyPublisher()

CountriesSwiftUI/UI/Screens/CountryDetails.swift

@@ -11,7 +11,7 @@ import Combine
 
 struct CountryDetails: View {
 
-    let country: Country
+    private let country: Country
 
     @Environment(\.locale) var locale: Locale
     @Environment(\.injected) private var injected: DIContainer
@@ -20,7 +20,7 @@ struct CountryDetails: View {
     private var routingBinding: Binding<Routing> {
         $routingState.dispatched(to: injected.appState, \.routing.countryDetails)
     }
-    let inspection = Inspection<Self>()
+    private let inspection = Inspection<Self>()
 
     init(country: Country, details: Loadable<Country.Details> = .notRequested) {
         self.country = country

CountriesSwiftUI/Utilities/LazyList.swift

@@ -13,7 +13,7 @@ struct LazyList<T> {
     typealias Access = (Int) throws -> T?
     private let access: Access
     private let useCache: Bool
-    private var cache = Cache()
+    private let cache = Cache()
 
     let count: Int