diff --git a/BluefruitPlayground/AdafruitKit/Utils/TouchReleaseRectangularPaletteControl.swift b/BluefruitPlayground/AdafruitKit/Utils/TouchReleaseRectangularPaletteControl.swift deleted file mode 100644 index de74faa..0000000 --- a/BluefruitPlayground/AdafruitKit/Utils/TouchReleaseRectangularPaletteControl.swift +++ /dev/null @@ -1,22 +0,0 @@ -// -// TouchReleaseRectangularPaletteControl.swift -// BluefruitPlayground -// -// Created by Antonio García on 16/12/2019. -// Copyright © 2019 Adafruit. All rights reserved. -// - -import UIKit -import FlexColorPicker - -class TouchReleaseRectangularPaletteControl: RectangularPaletteControl { - - /* - // Only override draw() if you perform custom drawing. - // An empty implementation adversely affects performance during animation. - override func draw(_ rect: CGRect) { - // Drawing code - } - */ - -} diff --git a/BluefruitPlayground/Base.lproj/Main.storyboard b/BluefruitPlayground/Base.lproj/Main.storyboard index 39a35d0..2009b59 100644 --- a/BluefruitPlayground/Base.lproj/Main.storyboard +++ b/BluefruitPlayground/Base.lproj/Main.storyboard @@ -1223,14 +1223,14 @@ - + - + - + @@ -1280,10 +1280,10 @@ - + - + @@ -1550,19 +1550,19 @@ - + - + - + - + - + diff --git a/BluefruitPlayground/Config.swift b/BluefruitPlayground/Config.swift index 6549624..281c8e6 100644 --- a/BluefruitPlayground/Config.swift +++ b/BluefruitPlayground/Config.swift @@ -12,10 +12,13 @@ struct Config { // Debug----------------------------------------------------------------------------- static let isDebugEnabled = _isDebugAssertConfiguration() + + // Fastlane snapshots + private static let areFastlaneSnapshotsRunning = UserDefaults.standard.bool(forKey: "FASTLANE_SNAPSHOT") // Bluetooth #if SIMULATEBLUETOOTH - static let isTutorialEnabled = !isDebugEnabled + static let isTutorialEnabled = areFastlaneSnapshotsRunning || !isDebugEnabled static let isBleUnsupportedWarningEnabled = false static let bleManager = BleManagerSimulated.simulated #else diff --git a/BluefruitPlayground/Resources/localization/en.lproj/Localizable.strings b/BluefruitPlayground/Resources/localization/en.lproj/Localizable.strings index eeb89e5..c7d06b8 100644 --- a/BluefruitPlayground/Resources/localization/en.lproj/Localizable.strings +++ b/BluefruitPlayground/Resources/localization/en.lproj/Localizable.strings @@ -110,7 +110,7 @@ Download it from the Bluefruit Playground guide at learn.adafruit.com"; "modules_title" = "Modules"; "modules_subtitle" = "Each module interacts with a specific type of sensor on the Circuit Playground Bluefruit device"; -"modules_color_title" = "Neopixels"; +"modules_color_title" = "NeoPixels"; "modules_color_subtitle" = "Control LED color & animation"; "modules_light_title" = "Light Sensor"; "modules_light_subtitle" = "View continuous light sensor readings"; @@ -124,14 +124,14 @@ Download it from the Bluefruit Playground guide at learn.adafruit.com"; "modules_temperature_subtitle" = "View current temperature readings"; // Neopixels -"neopixels_title" = "Neopixels"; -"neopixels_help" = "Neopixel mode allows you to control the color of CPB’s built-in neopixel LEDs individually, as a group, or by playing preset animations. +"neopixels_title" = "NeoPixels"; +"neopixels_help" = "NeoPixels mode allows you to control the color of CPB’s built-in NeoPixel LEDs individually, as a group, or by playing preset animations. -• Select neopixels to control by tapping them in the Circuit Playground Bluefruit image. +• Select NeoPixels to control by tapping them in the Circuit Playground Bluefruit image. -• Set the color of selected neopixels by choosing a color from the Color Palette or Color Wheel at the bottom. +• Set the color of selected NeoPixels by choosing a color from the Color Palette or Color Wheel at the bottom. -• Tap a light sequence to trigger an animation using all of the neopixels."; +• Tap a light sequence to trigger an animation using all of the NeoPixels."; "neopixels_sequence_title" = "Light Sequence"; "neopixels_sequence_speed" = "Speed"; diff --git a/BluefruitPlaygroundUITests/BluefruitPlaygroundUITests.swift b/BluefruitPlaygroundUITests/BluefruitPlaygroundUITests.swift index 532535d..2290d90 100644 --- a/BluefruitPlaygroundUITests/BluefruitPlaygroundUITests.swift +++ b/BluefruitPlaygroundUITests/BluefruitPlaygroundUITests.swift @@ -27,7 +27,7 @@ class BluefruitPlaygroundUITests: XCTestCase { // Put teardown code here. This method is called after the invocation of each test method in the class. } - func testExample() { + func testSnapshots() { /* // UI tests must launch the application that they test. let app = XCUIApplication() @@ -40,7 +40,7 @@ class BluefruitPlaygroundUITests: XCTestCase { let scrollViewsQuery = app.scrollViews let elementsQuery = scrollViewsQuery.otherElements - sleep(3) // Wait for the intro animation + sleep(2) // Wait for the intro animation snapshot("01a_Welcome") elementsQuery.buttons["LET'S GET STARTED..."].tap() @@ -51,7 +51,7 @@ class BluefruitPlaygroundUITests: XCTestCase { elementsQuery.buttons["BEGIN PAIRING"].tap() let tablesQuery = app.tables - tablesQuery/*@START_MENU_TOKEN@*/.staticTexts["Simulated Peripheral"]/*[[".cells.staticTexts[\"Simulated Peripheral\"]",".staticTexts[\"Simulated Peripheral\"]"],[[[-1,1],[-1,0]]],[0]]@END_MENU_TOKEN@*/.tap() + tablesQuery.staticTexts["Simulated Peripheral"].tap() snapshot("02_Modules") diff --git a/Gemfile.lock b/Gemfile.lock index 3a19bed..f2e4d33 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.6) + CFPropertyList (3.0.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) atomos (0.1.3) @@ -18,7 +18,7 @@ GEM unf (>= 0.0.5, < 1.0.0) dotenv (2.7.5) emoji_regex (1.0.1) - excon (0.71.0) + excon (0.71.1) faraday (0.17.1) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) @@ -27,7 +27,7 @@ GEM faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) fastimage (2.1.7) - fastlane (2.137.0) + fastlane (2.138.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -36,7 +36,7 @@ GEM commander-fastlane (>= 4.4.6, < 5.0.0) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 2.0) - excon (>= 0.45.0, < 1.0.0) + excon (>= 0.71.0, < 1.0.0) faraday (~> 0.17) faraday-cookie_jar (~> 0.0.6) faraday_middleware (~> 0.13.1) @@ -61,7 +61,7 @@ GEM tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) - xcodeproj (>= 1.8.1, < 2.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) @@ -93,7 +93,7 @@ GEM http-cookie (1.0.3) domain_name (~> 0.5) httpclient (2.8.3) - json (2.1.0) + json (2.3.0) jwt (2.1.0) memoist (0.16.2) mime-types (3.3) @@ -121,7 +121,7 @@ GEM faraday (~> 0.9) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simctl (1.6.6) + simctl (1.6.7) CFPropertyList naturally slack-notifier (2.3.2) @@ -138,7 +138,7 @@ GEM unf_ext (0.0.7.6) unicode-display_width (1.6.0) word_wrap (1.0.0) - xcodeproj (1.12.0) + xcodeproj (1.14.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/fastlane/Deliverfile b/fastlane/Deliverfile new file mode 100644 index 0000000..74739f7 --- /dev/null +++ b/fastlane/Deliverfile @@ -0,0 +1,3 @@ +# The Deliverfile allows you to store various App Store Connect metadata +# For more information, check out the docs +# https://docs.fastlane.tools/actions/deliver/ diff --git a/fastlane/Snapfile b/fastlane/Snapfile index 81bfd2b..c6fd680 100644 --- a/fastlane/Snapfile +++ b/fastlane/Snapfile @@ -6,8 +6,8 @@ "iPhone 11", "iPhone 8 Plus", "iPhone 8", - "iPhone SE", - + +# "iPhone SE", # "iPhone 6", # "iPhone 6 Plus", # "iPhone 5", @@ -29,7 +29,8 @@ languages([ # Where should the resulting screenshots be stored? # output_directory "./screenshots" -# clear_previous_screenshots true # remove the '#' to clear all previously generated screenshots before creating new ones +# remove the '#' to clear all previously generated screenshots before creating new ones +clear_previous_screenshots true # Choose which project/workspace to use # project "./Project.xcodeproj"