Fully fixed Fastlane screenshots to use correct localization

iComputerfreak · iComputerfreak · commit 43483618e46c · 2023-01-19T00:19:58.000+01:00
Removed Pro limit for distribution on TestFlight
Changed popovers to sheets to correctly display on iPad
Made sidebar in lists view initially visible on iPad
Removed duplicate fastlane files form root directory
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,7 +8,7 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.693.0)
+    aws-partitions (1.694.0)
     aws-sdk-core (3.168.4)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
@@ -215,4 +215,4 @@ DEPENDENCIES
   fastlane
 
 BUNDLED WITH
-   2.3.26
+   2.4.2
diff --git a/Movie DB/AppDelegate.swift b/Movie DB/AppDelegate.swift
@@ -28,14 +28,13 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                 // Prepare with sample data for taking screenshots
                 PersistenceController.prepareForUITesting()
                 JFConfig.shared.region = Locale.current.region?.identifier ?? ""
-                // !!!: If the device is set to "English" (not "English (United States)"), the device region is used
-                // !!!: e.g. setting the device language to "English" and the region to "Germany", yields "en_DE",
-                // !!!: which is not a valid language identifier for the API.
-                // !!!: So we need to make sure to only use full language identifiers (e.g. setting the device language
-                // !!!: to "English (United States)" instead of "English".
+                // Combining language and region can lead to invalid language/region pairs (e.g. if the device language
+                // is "English" and the device region is "Germany", the pair will be "en-DE", on the other hand, if the
+                // device language is "English (Australia)" and the region is "Germany", the pair will correctly be
+                // "en-AU".
                 let lang = Locale.current.language.languageCode!.identifier
                 let region = Locale.current.language.region!.identifier
-                JFConfig.shared.language = "\(lang)_\(region)"
+                JFConfig.shared.language = "\(lang)-\(region)"
                 
                 let bgContext = PersistenceController.viewContext.newBackgroundContext()
                 // Add sample data
diff --git a/Movie DB/Utility/Utils.swift b/Movie DB/Utility/Utils.swift
@@ -204,7 +204,7 @@ struct Utils {
     }
     
     static func purchasedPro() -> Bool {
-        return true
+        true
         // TODO: Re-enable for release
 //        UserDefaults.standard.bool(forKey: JFLiterals.inAppPurchaseIDPro)
     }
diff --git a/Movie DB/Views/Add Media/AddMediaView.swift b/Movie DB/Views/Add Media/AddMediaView.swift
@@ -42,7 +42,7 @@ struct AddMediaView: View {
                 }))
             }
         }
-        .popover(isPresented: $isShowingProPopup) {
+        .sheet(isPresented: $isShowingProPopup) {
             ProInfoView()
         }
     }
@@ -80,7 +80,7 @@ struct AddMediaView: View {
 struct AddMediaView_Previews: PreviewProvider {
     static var previews: some View {
         Text("")
-            .popover(isPresented: .constant(true)) {
+            .sheet(isPresented: .constant(true)) {
                 AddMediaView()
             }
     }
diff --git a/Movie DB/Views/Add Media/LookupView.swift b/Movie DB/Views/Add Media/LookupView.swift
@@ -31,7 +31,7 @@ struct LookupView: View {
                 .navigationTitle(Strings.TabView.lookupLabel)
             }
         }
-        .popover(isPresented: $isShowingProPopup) {
+        .sheet(isPresented: $isShowingProPopup) {
             ProInfoView()
         }
     }
diff --git a/Movie DB/Views/MediaLists/MediaListsRootView.swift b/Movie DB/Views/MediaLists/MediaListsRootView.swift
@@ -42,9 +42,11 @@ struct MediaListsRootView: View {
     }
     
     @State private var selectedMedia: Media?
+    // Show the sidebar by default
+    @State private var columnVisibility: NavigationSplitViewVisibility = .all
     
     var body: some View {
-        NavigationSplitView {
+        NavigationSplitView(columnVisibility: $columnVisibility) {
             List {
                 // MARK: - Default Lists (disabled during editing)
                 Section(Strings.Lists.defaultListsHeader) {
@@ -165,6 +167,7 @@ struct MediaListsRootView: View {
                 }
                 .accessibilityIdentifier("new-custom-list")
             }
+            .accessibilityIdentifier("new-list")
         }
     }
     
diff --git a/Movie DB/Views/MediaLists/User List Views/DynamicMediaListView.swift b/Movie DB/Views/MediaLists/User List Views/DynamicMediaListView.swift
@@ -27,7 +27,7 @@ struct DynamicMediaListView: View {
             ListConfigurationButton($isShowingConfiguration)
         }
         // MARK: Editing View / Configuration View
-        .popover(isPresented: $isShowingConfiguration) {
+        .sheet(isPresented: $isShowingConfiguration) {
             ListConfigurationView(list: list) { list in
                 // MARK: List Details
                 // This binding uses the global list property defined in DynamicMediaListView, not the parameter
diff --git a/Movie DB/Views/MediaLists/User List Views/UserMediaListView.swift b/Movie DB/Views/MediaLists/User List Views/UserMediaListView.swift
@@ -34,7 +34,7 @@ struct UserMediaListView: View {
             ListConfigurationButton($isShowingConfiguration)
         }
         // MARK: Editing View / Configuration View
-        .popover(isPresented: $isShowingConfiguration) {
+        .sheet(isPresented: $isShowingConfiguration) {
             ListConfigurationView(list: list) { list in
                 MediaListEditingSection(name: $list.name, iconName: $list.iconName)
             }
diff --git a/Movie DB/Views/Settings/ImportExport/ImportExportSection.swift b/Movie DB/Views/Settings/ImportExport/ImportExportSection.swift
@@ -32,7 +32,7 @@ struct ImportExportSection: View {
             ExportTagsButton(config: $config)
         }
         // MARK: Import Log Popover
-        .popover(isPresented: $config.importLogShowing) {
+        .sheet(isPresented: $config.importLogShowing) {
             if let logger = $config.importLogger.wrappedValue {
                 ImportLogViewer(logger: logger)
             } else {
diff --git a/Movie DB/Views/Settings/LibraryActionsSection.swift b/Movie DB/Views/Settings/LibraryActionsSection.swift
@@ -25,13 +25,16 @@ struct LibraryActionsSection: View {
             Button(Strings.Settings.reloadLibraryLabel, action: self.reloadHandler)
             Button(Strings.Settings.resetLibraryLabel, action: self.resetLibrary)
             #if DEBUG
-                Button("Debug") {
-                    // swiftlint:disable line_length
-                    print("Medias: \(Utils.allMedias(context: PersistenceController.viewContext).count)")
-                    print("Genres: \(Utils.allGenres(context: PersistenceController.viewContext).count)")
-                    print("Tags: \(Utils.allObjects(entityName: "Tag", context: PersistenceController.viewContext).count)")
-                    print("ProductionCompany: \(Utils.allObjects(entityName: "ProductionCompany", context: PersistenceController.viewContext).count)")
-                    // swiftlint:enable line_length
+                // Don't show the debug button when doing App Store screenshots via Fastlane
+                if ProcessInfo.processInfo.environment["FASTLANE_SNAPSHOT"] != "YES" {
+                    Button("Debug") {
+                        // swiftlint:disable line_length
+                        print("Medias: \(Utils.allMedias(context: PersistenceController.viewContext).count)")
+                        print("Genres: \(Utils.allGenres(context: PersistenceController.viewContext).count)")
+                        print("Tags: \(Utils.allObjects(entityName: "Tag", context: PersistenceController.viewContext).count)")
+                        print("ProductionCompany: \(Utils.allObjects(entityName: "ProductionCompany", context: PersistenceController.viewContext).count)")
+                        // swiftlint:enable line_length
+                    }
                 }
             #endif
         }
diff --git a/Movie DB/Views/Settings/ProSection.swift b/Movie DB/Views/Settings/ProSection.swift
@@ -15,7 +15,7 @@ struct ProSection: View {
     var body: some View {
         Section {
             Button(Strings.Settings.buyProLabel, action: { self.config.isShowingProInfo = true })
-                .popover(isPresented: $config.isShowingProInfo) {
+                .sheet(isPresented: $config.isShowingProInfo) {
                     ProInfoView()
                 }
         }
diff --git a/Movie DBScreenshots/Movie_DBScreenshots.swift b/Movie DBScreenshots/Movie_DBScreenshots.swift
@@ -21,6 +21,10 @@ final class Movie_DBScreenshots: XCTestCase {
         setupSnapshot(app)
         // Reset snapshot counter
         snapshotCounter = 1
+        // If device is iPad, put it into landscape mode
+        if UIDevice.current.userInterfaceIdiom == .pad {
+            XCUIDevice.shared.orientation = UIDeviceOrientation.landscapeLeft
+        }
     }
     
     override func tearDownWithError() throws {
@@ -46,13 +50,13 @@ final class Movie_DBScreenshots: XCTestCase {
         app.tabBars.buttons.element(boundBy: 1).tap()
         
         // Add dynamic list
-        app.navigationBars.buttons.firstMatch.tap() // New...
+        app.navigationBars.buttons["new-list"].tap() // New...
         app.buttons["new-dynamic-list"].tap()
         app.typeText("5-star Movies")
         app.alerts.buttons.element(boundBy: 1).tap() // Add
         
         // Add custom list
-        app.navigationBars.buttons.firstMatch.tap()
+        app.navigationBars.buttons["new-list"].tap()
         app.buttons["new-custom-list"].tap()
         app.typeText("Recommend to Ben")
         app.alerts.buttons.element(boundBy: 1).tap()
@@ -62,11 +66,20 @@ final class Movie_DBScreenshots: XCTestCase {
         app.cells.buttons.element(boundBy: 2).tap()
         snapshot("Watchlist")
         
-        app.navigationBars.buttons.firstMatch.tap() // Back
+        if UIDevice.current.userInterfaceIdiom == .phone {
+            app.navigationBars.buttons.firstMatch.tap() // Back
+        }
         app.cells.buttons["5-star Movies"].tap()
-        app.navigationBars.firstMatch.buttons.element(boundBy: 1).tap() // Configure...
+        let buttonOffset = UIDevice.current.userInterfaceIdiom == .phone ? 1 : 0
+        app.navigationBars["5-star Movies"].buttons.element(boundBy: buttonOffset).tap() // Configure...
         app.cells.buttons.element(boundBy: 4).tap() // Media type
         app.collectionViews.firstMatch.buttons.element(boundBy: 1).tap() // Movie
+        app.cells.buttons.element(boundBy: 6).tap() // Personal Rating
+        // Increase to 5 stars
+        app.steppers.firstMatch.buttons["Increment"].tap(withNumberOfTaps: 5, numberOfTouches: 5)
+        app.steppers.firstMatch.buttons["Increment"].tap(withNumberOfTaps: 5, numberOfTouches: 5)
+        app.navigationBars.buttons.firstMatch.tap() // Back
+        
         snapshot("ListConfiguration")
         app.navigationBars.firstMatch.buttons.firstMatch.tap() // Done
         
diff --git a/Snapfile b/Snapfile
diff --git a/SnapshotHelper.swift b/SnapshotHelper.swift

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ struct Utils {`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`static func purchasedPro() -> Bool {`
`207`		`- return true`
	`207`	`+ true`
`208`	`208`	`// TODO: Re-enable for release`
`209`	`209`	`// UserDefaults.standard.bool(forKey: JFLiterals.inAppPurchaseIDPro)`
`210`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ struct AddMediaView: View {`
`42`	`42`	`}))`
`43`	`43`	`}`
`44`	`44`	`}`
`45`		`- .popover(isPresented: $isShowingProPopup) {`
	`45`	`+ .sheet(isPresented: $isShowingProPopup) {`
`46`	`46`	`ProInfoView()`
`47`	`47`	`}`
`48`	`48`	`}`
`@@ -80,7 +80,7 @@ struct AddMediaView: View {`
`80`	`80`	`struct AddMediaView_Previews: PreviewProvider {`
`81`	`81`	`static var previews: some View {`
`82`	`82`	`Text("")`
`83`		`- .popover(isPresented: .constant(true)) {`
	`83`	`+ .sheet(isPresented: .constant(true)) {`
`84`	`84`	`AddMediaView()`
`85`	`85`	`}`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ struct LookupView: View {`
`31`	`31`	`.navigationTitle(Strings.TabView.lookupLabel)`
`32`	`32`	`}`
`33`	`33`	`}`
`34`		`- .popover(isPresented: $isShowingProPopup) {`
	`34`	`+ .sheet(isPresented: $isShowingProPopup) {`
`35`	`35`	`ProInfoView()`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,11 @@ struct MediaListsRootView: View {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@State private var selectedMedia: Media?`
	`45`	`+ // Show the sidebar by default`
	`46`	`+ @State private var columnVisibility: NavigationSplitViewVisibility = .all`
`45`	`47`
`46`	`48`	`var body: some View {`
`47`		`- NavigationSplitView {`
	`49`	`+ NavigationSplitView(columnVisibility: $columnVisibility) {`
`48`	`50`	`List {`
`49`	`51`	`// MARK: - Default Lists (disabled during editing)`
`50`	`52`	`Section(Strings.Lists.defaultListsHeader) {`
`@@ -165,6 +167,7 @@ struct MediaListsRootView: View {`
`165`	`167`	`}`
`166`	`168`	`.accessibilityIdentifier("new-custom-list")`
`167`	`169`	`}`
	`170`	`+ .accessibilityIdentifier("new-list")`
`168`	`171`	`}`
`169`	`172`	`}`
`170`	`173`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ struct DynamicMediaListView: View {`
`27`	`27`	`ListConfigurationButton($isShowingConfiguration)`
`28`	`28`	`}`
`29`	`29`	`// MARK: Editing View / Configuration View`
`30`		`- .popover(isPresented: $isShowingConfiguration) {`
	`30`	`+ .sheet(isPresented: $isShowingConfiguration) {`
`31`	`31`	`ListConfigurationView(list: list) { list in`
`32`	`32`	`// MARK: List Details`
`33`	`33`	`// This binding uses the global list property defined in DynamicMediaListView, not the parameter`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ struct UserMediaListView: View {`
`34`	`34`	`ListConfigurationButton($isShowingConfiguration)`
`35`	`35`	`}`
`36`	`36`	`// MARK: Editing View / Configuration View`
`37`		`- .popover(isPresented: $isShowingConfiguration) {`
	`37`	`+ .sheet(isPresented: $isShowingConfiguration) {`
`38`	`38`	`ListConfigurationView(list: list) { list in`
`39`	`39`	`MediaListEditingSection(name: $list.name, iconName: $list.iconName)`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ struct ImportExportSection: View {`
`32`	`32`	`ExportTagsButton(config: $config)`
`33`	`33`	`}`
`34`	`34`	`// MARK: Import Log Popover`
`35`		`- .popover(isPresented: $config.importLogShowing) {`
	`35`	`+ .sheet(isPresented: $config.importLogShowing) {`
`36`	`36`	`if let logger = $config.importLogger.wrappedValue {`
`37`	`37`	`ImportLogViewer(logger: logger)`
`38`	`38`	`} else {`