From 769deb8710e82738718d19ed2c4263f1f1a911c2 Mon Sep 17 00:00:00 2001 From: Emilio Pavia Date: Fri, 9 Oct 2020 15:05:31 +0200 Subject: [PATCH 1/5] Update Podfile.lock --- .swiftlint.yml | 3 + Podfile | 45 ----- Podfile.lock | 171 ++++++++++++------ .../ExperimentCoordinatorViewController.swift | 6 +- .../UI/ExperimentsListViewController.swift | 5 +- ScienceJournal/UI/ObserveViewController.swift | 4 +- ScienceJournal/UI/Snackbars.swift | 4 +- .../UI/TrialDetailViewController.swift | 2 +- 8 files changed, 125 insertions(+), 115 deletions(-) diff --git a/.swiftlint.yml b/.swiftlint.yml index 3adfa9f6..0decf5ae 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -34,3 +34,6 @@ disabled_rules: - cyclomatic_complexity # We'll catch future issues in code review. - nesting # We have some cases where deeper nesting is desirable. - trailing_whitespace # So annoying... + - computed_accessors_order + - unneeded_notification_center_removal + - mark diff --git a/Podfile b/Podfile index 5c403a5a..6dbc3a59 100644 --- a/Podfile +++ b/Podfile @@ -71,53 +71,8 @@ post_install do |installer| puts "Setting deployment target #{deployment_target} for #{config.name} on #{target.name}..." end config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target - upgrade_to_recommended_settings! config end end puts "Generating Science Journal protos..." system("cd Protos && ./generate.sh") - puts "Removing unfixable warnings..." - remove_unfixable_warnings! installer - puts "Fixing UIWebView usage..." - replace_uiwebview_with_wkwebview! installer -end - -def upgrade_to_recommended_settings! config - if Pod::VERSION == '1.7.3' - # Having this set triggers Xcode's "Upgrade to recommended settings" - config.build_settings.delete('ARCHS') - end -end - -def remove_unfixable_warnings! installer - installer.pod_targets.each do |target| - if target.name == 'MaterialComponents' && target.version == '85.0.0' - # The *ColorThemer types currently emit deprecation warnings, - # but the new versions aren't available yet. - installer.pods_project.files.map(&:path).grep(/MDC\w+ColorThemer.h/).each do |file| - path = "Pods/MaterialComponents/#{file}" - content = IO.read(path).gsub(/__deprecated_msg\([^)]*\)/, '') - File.chmod(0644, path) - IO.write(path, content) - File.chmod(0444, path) - end - end - end -end - -def replace_uiwebview_with_wkwebview! installer - installer.pod_targets.each do |target| - if target.name == 'MaterialComponents' && target.version == '85.0.0' - installer.pods_project.files.map(&:path).grep(/MDCBottomSheetPresentationController.m/).each do |file| - path = "Pods/MaterialComponents/#{file}" - content = IO.read(path) - .gsub(/UIWebView/, 'WKWebView') - .gsub(/#import "MDCBottomSheetPresentationController.h"/, - "#import \"MDCBottomSheetPresentationController.h\"\n\n#import \n") - File.chmod(0644, path) - IO.write(path, content) - File.chmod(0444, path) - end - end - end end diff --git a/Podfile.lock b/Podfile.lock index 6227e729..a717674a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -4,23 +4,27 @@ PODS: - GoogleAPIClientForREST/Drive (1.2.1): - GoogleAPIClientForREST/Core - GTMSessionFetcher (>= 1.1.7) - - GTMSessionFetcher (1.2.2): - - GTMSessionFetcher/Full (= 1.2.2) - - GTMSessionFetcher/Core (1.2.2) - - GTMSessionFetcher/Full (1.2.2): - - GTMSessionFetcher/Core (= 1.2.2) - - MaterialComponents/ActionSheet (85.0.0): + - GTMSessionFetcher (1.4.0): + - GTMSessionFetcher/Full (= 1.4.0) + - GTMSessionFetcher/Core (1.4.0) + - GTMSessionFetcher/Full (1.4.0): + - GTMSessionFetcher/Core (= 1.4.0) + - MaterialComponents/ActionSheet (118.0.0): + - MaterialComponents/Availability - MaterialComponents/BottomSheet + - MaterialComponents/Elevation - MaterialComponents/Ink + - MaterialComponents/private/Math - MaterialComponents/Ripple + - MaterialComponents/ShadowElevations - MaterialComponents/Typography - - MaterialComponents/ActivityIndicator (85.0.0): + - MaterialComponents/ActivityIndicator (118.0.0): - MaterialComponents/Palettes - MaterialComponents/private/Application - MDFInternationalization - MotionAnimator (~> 2.0) - - MaterialComponents/AnimationTiming (85.0.0) - - MaterialComponents/AppBar (85.0.0): + - MaterialComponents/AnimationTiming (118.0.0) + - MaterialComponents/AppBar (118.0.0): - MaterialComponents/FlexibleHeader - MaterialComponents/HeaderStackView - MaterialComponents/NavigationBar @@ -31,29 +35,35 @@ PODS: - MaterialComponents/ShadowLayer - MaterialComponents/Typography - MDFInternationalization - - MaterialComponents/BottomSheet (85.0.0): + - MaterialComponents/Availability (118.0.0) + - MaterialComponents/BottomSheet (118.0.0): + - MaterialComponents/Elevation - MaterialComponents/private/KeyboardWatcher - MaterialComponents/private/Math + - MaterialComponents/ShadowElevations + - MaterialComponents/ShadowLayer - MaterialComponents/ShapeLibrary - MaterialComponents/Shapes - - MaterialComponents/ButtonBar (85.0.0): + - MaterialComponents/ButtonBar (118.0.0): - MaterialComponents/Buttons - MaterialComponents/private/Application - MDFInternationalization - - MaterialComponents/Buttons (85.0.0): + - MaterialComponents/Buttons (118.0.0): + - MaterialComponents/Elevation - MaterialComponents/Ink - MaterialComponents/private/Math - MaterialComponents/Ripple - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer + - MaterialComponents/ShapeLibrary - MaterialComponents/Shapes - MaterialComponents/Typography - MDFInternationalization - MDFTextAccessibility - - "MaterialComponents/Buttons+ColorThemer (85.0.0)": + - "MaterialComponents/Buttons+ColorThemer (118.0.0)": - MaterialComponents/Buttons - MaterialComponents/schemes/Color - - MaterialComponents/CollectionCells (85.0.0): + - MaterialComponents/CollectionCells (118.0.0): - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/Palettes @@ -64,105 +74,145 @@ PODS: - MaterialComponents/private/Icons/ic_radio_button_unchecked - MaterialComponents/private/Icons/ic_reorder - MaterialComponents/private/Math + - MaterialComponents/Ripple - MaterialComponents/Typography - MDFInternationalization - - MaterialComponents/CollectionLayoutAttributes (85.0.0) - - MaterialComponents/Collections (85.0.0): + - MaterialComponents/CollectionLayoutAttributes (118.0.0) + - MaterialComponents/Collections (118.0.0): + - MaterialComponents/Availability - MaterialComponents/CollectionCells - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/Palettes + - MaterialComponents/Ripple - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/Dialogs (85.0.0): + - MaterialComponents/Dialogs (118.0.0): - MaterialComponents/Buttons + - MaterialComponents/Elevation - MaterialComponents/private/KeyboardWatcher + - MaterialComponents/private/Math - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - MDFInternationalization - - "MaterialComponents/Dialogs+ColorThemer (85.0.0)": + - "MaterialComponents/Dialogs+ColorThemer (118.0.0)": - "MaterialComponents/Buttons+ColorThemer" - MaterialComponents/Dialogs - MaterialComponents/Themes - - MaterialComponents/FeatureHighlight (85.0.0): + - MaterialComponents/Elevation (118.0.0): + - MaterialComponents/Availability + - MaterialComponents/private/Color + - MaterialComponents/private/Math + - MaterialComponents/FeatureHighlight (118.0.0): + - MaterialComponents/Availability - MaterialComponents/private/Math - MaterialComponents/Typography - MDFTextAccessibility - - "MaterialComponents/FeatureHighlight+ColorThemer (85.0.0)": + - "MaterialComponents/FeatureHighlight+ColorThemer (118.0.0)": - MaterialComponents/FeatureHighlight - MaterialComponents/Themes - - MaterialComponents/FlexibleHeader (85.0.0): + - MaterialComponents/FlexibleHeader (118.0.0): + - MaterialComponents/Availability + - MaterialComponents/Elevation + - "MaterialComponents/FlexibleHeader+ShiftBehavior" + - "MaterialComponents/FlexibleHeader+ShiftBehaviorEnabledWithStatusBar" - MaterialComponents/private/Application + - MaterialComponents/private/Math - MaterialComponents/private/UIMetrics + - MaterialComponents/ShadowElevations + - MaterialComponents/ShadowLayer - MDFTextAccessibility - - MaterialComponents/HeaderStackView (85.0.0) - - MaterialComponents/Ink (85.0.0): + - "MaterialComponents/FlexibleHeader+ShiftBehavior (118.0.0)" + - "MaterialComponents/FlexibleHeader+ShiftBehaviorEnabledWithStatusBar (118.0.0)": + - "MaterialComponents/FlexibleHeader+ShiftBehavior" + - MaterialComponents/HeaderStackView (118.0.0) + - MaterialComponents/Ink (118.0.0): + - MaterialComponents/Availability + - MaterialComponents/private/Color - MaterialComponents/private/Math - - MaterialComponents/NavigationBar (85.0.0): + - MaterialComponents/NavigationBar (118.0.0): - MaterialComponents/ButtonBar + - MaterialComponents/Elevation - MaterialComponents/private/Math - MaterialComponents/Typography - MDFInternationalization - MDFTextAccessibility - - MaterialComponents/OverlayWindow (85.0.0): + - MaterialComponents/OverlayWindow (118.0.0): + - MaterialComponents/Availability - MaterialComponents/private/Application - - MaterialComponents/PageControl (85.0.0): + - MaterialComponents/PageControl (118.0.0): - MDFInternationalization - - MaterialComponents/Palettes (85.0.0) - - MaterialComponents/private/Application (85.0.0) - - MaterialComponents/private/Icons/Base (85.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (85.0.0): + - MaterialComponents/Palettes (118.0.0) + - MaterialComponents/private/Application (118.0.0) + - MaterialComponents/private/Color (118.0.0): + - MaterialComponents/Availability + - MaterialComponents/private/Icons/Base (118.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (118.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check (85.0.0): + - MaterialComponents/private/Icons/ic_check (118.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check_circle (85.0.0): + - MaterialComponents/private/Icons/ic_check_circle (118.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_chevron_right (85.0.0): + - MaterialComponents/private/Icons/ic_chevron_right (118.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_info (85.0.0): + - MaterialComponents/private/Icons/ic_info (118.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_radio_button_unchecked (85.0.0): + - MaterialComponents/private/Icons/ic_radio_button_unchecked (118.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_reorder (85.0.0): + - MaterialComponents/private/Icons/ic_reorder (118.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/KeyboardWatcher (85.0.0): + - MaterialComponents/private/KeyboardWatcher (118.0.0): - MaterialComponents/private/Application - - MaterialComponents/private/Math (85.0.0) - - MaterialComponents/private/Overlay (85.0.0) - - MaterialComponents/private/UIMetrics (85.0.0): + - MaterialComponents/private/Math (118.0.0) + - MaterialComponents/private/Overlay (118.0.0) + - MaterialComponents/private/UIMetrics (118.0.0): - MaterialComponents/private/Application - - MaterialComponents/ProgressView (85.0.0): + - MaterialComponents/ProgressView (118.0.0): - MaterialComponents/Palettes - MaterialComponents/private/Math - MDFInternationalization - - MotionAnimator (~> 2.1) - - MaterialComponents/Ripple (85.0.0): + - MaterialComponents/Ripple (118.0.0): - MaterialComponents/AnimationTiming + - MaterialComponents/Availability + - MaterialComponents/private/Color - MaterialComponents/private/Math - - MaterialComponents/schemes/Color (85.0.0) - - MaterialComponents/schemes/Typography (85.0.0): + - MaterialComponents/schemes/Color (118.0.0): + - MaterialComponents/Availability + - MaterialComponents/private/Color + - MaterialComponents/schemes/Typography (118.0.0): + - "MaterialComponents/schemes/Typography+BasicFontScheme" + - "MaterialComponents/schemes/Typography+Scheming" - MaterialComponents/Typography - - MaterialComponents/ShadowElevations (85.0.0) - - MaterialComponents/ShadowLayer (85.0.0): + - "MaterialComponents/schemes/Typography+BasicFontScheme (118.0.0)" + - "MaterialComponents/schemes/Typography+Scheming (118.0.0)" + - MaterialComponents/ShadowElevations (118.0.0) + - MaterialComponents/ShadowLayer (118.0.0): - MaterialComponents/ShadowElevations - - MaterialComponents/ShapeLibrary (85.0.0): + - MaterialComponents/ShapeLibrary (118.0.0): - MaterialComponents/private/Math - MaterialComponents/Shapes - - MaterialComponents/Shapes (85.0.0): + - MaterialComponents/Shapes (118.0.0): + - MaterialComponents/private/Color - MaterialComponents/private/Math - MaterialComponents/ShadowLayer - - MaterialComponents/Snackbar (85.0.0): + - MaterialComponents/Snackbar (118.0.0): - MaterialComponents/AnimationTiming + - MaterialComponents/Availability - MaterialComponents/Buttons + - MaterialComponents/Elevation - MaterialComponents/OverlayWindow - MaterialComponents/private/Application - MaterialComponents/private/KeyboardWatcher + - MaterialComponents/private/Math - MaterialComponents/private/Overlay + - MaterialComponents/ShadowElevations + - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/Tabs (85.0.0): + - MaterialComponents/Tabs (118.0.0): - MaterialComponents/AnimationTiming + - MaterialComponents/Elevation - MaterialComponents/Ink - MaterialComponents/Palettes - MaterialComponents/private/Math @@ -171,18 +221,21 @@ PODS: - MaterialComponents/ShadowLayer - MaterialComponents/Typography - MDFInternationalization - - MaterialComponents/TextFields (85.0.0): + - MaterialComponents/TextFields (118.0.0): - MaterialComponents/AnimationTiming + - MaterialComponents/Buttons + - MaterialComponents/Elevation - MaterialComponents/Palettes - MaterialComponents/private/Math - MaterialComponents/Typography - MDFInternationalization - - MaterialComponents/Themes (85.0.0): + - MaterialComponents/Themes (118.0.0): - MaterialComponents/schemes/Color - MaterialComponents/schemes/Typography - - MaterialComponents/Typography (85.0.0): + - MaterialComponents/Typography (118.0.0): - MaterialComponents/private/Application - MaterialComponents/private/Math + - MDFTextAccessibility - MDFInternationalization (2.0.0) - MDFTextAccessibility (2.0.0) - MotionAnimator (2.8.1): @@ -191,7 +244,7 @@ PODS: - Protobuf (3.5.0) - SnapKit (5.0.0) - SSZipArchive (2.1.1) - - SwiftLint (0.33.0) + - SwiftLint (0.40.3) DEPENDENCIES: - GoogleAPIClientForREST/Drive (~> 1.2.1) @@ -247,8 +300,8 @@ SPEC REPOS: SPEC CHECKSUMS: GoogleAPIClientForREST: a8b95a252014ce2e618df6b75dc72eca2c00b4af - GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23 - MaterialComponents: 9e545cf19802e6acf017fe774c90e36176ea7066 + GTMSessionFetcher: 6f5c8abbab8a9bce4bb3f057e317728ec6182b10 + MaterialComponents: 333a09d55de4bc53e0e2e08f178c6f29cfe8645f MDFInternationalization: 010097556d6b09d2c4ea38e0820ea6d37be6a314 MDFTextAccessibility: 85c09a1bd9c321f494348e632a25063bcda35a53 MotionAnimator: ee16aa30567c5bae0fb2750c132915829cfaaf8a @@ -256,8 +309,8 @@ SPEC CHECKSUMS: Protobuf: 8a9838fba8dae3389230e1b7f8c104aa32389c03 SnapKit: fd22d10eb9aff484d79a8724eab922c1ddf89bcf SSZipArchive: 14401ade5f8e82aba1ff03e9f88e9de60937ae60 - SwiftLint: fed9c66336e41fc74dc48a73678380718f0c8b0e + SwiftLint: dfd554ff0dff17288ee574814ccdd5cea85d76f7 -PODFILE CHECKSUM: 1ac19eccb38684fe8747c94a3b160062e8af4be6 +PODFILE CHECKSUM: 7fc20c5c17bd14830e5b0930dfd5f5b75cdf86d3 COCOAPODS: 1.9.3 diff --git a/ScienceJournal/UI/ExperimentCoordinatorViewController.swift b/ScienceJournal/UI/ExperimentCoordinatorViewController.swift index 4c496c71..133ce9c9 100644 --- a/ScienceJournal/UI/ExperimentCoordinatorViewController.swift +++ b/ScienceJournal/UI/ExperimentCoordinatorViewController.swift @@ -480,7 +480,7 @@ class ExperimentCoordinatorViewController: MaterialHeaderViewController, DrawerP [snackbarCategoryTriggersDisabled, snackbarCategoryDeletedRecording, snackbarCategoryNoteDeleted, snackbarCategoryExperimentArchivedState, snackbarCategoryTrialArchivedState, snackbarCategoryCouldNotUpdateSensorSettings].forEach { - MDCSnackbarManager.dismissAndCallCompletionBlocks(withCategory: $0) + MDCSnackbarManager.default.dismissAndCallCompletionBlocks(withCategory: $0) } } @@ -935,7 +935,7 @@ class ExperimentCoordinatorViewController: MaterialHeaderViewController, DrawerP undoBlock: undoBlock) } else { // If the user is unarchiving, hide any archived state undo snackbars. - MDCSnackbarManager.dismissAndCallCompletionBlocks( + MDCSnackbarManager.default.dismissAndCallCompletionBlocks( withCategory: snackbarCategoryTrialArchivedState) } } @@ -958,7 +958,7 @@ class ExperimentCoordinatorViewController: MaterialHeaderViewController, DrawerP undoBlock: undoBlock) } else { // If the user is unarchiving, hide any archived state undo snackbars. - MDCSnackbarManager.dismissAndCallCompletionBlocks( + MDCSnackbarManager.default.dismissAndCallCompletionBlocks( withCategory: self.snackbarCategoryExperimentArchivedState) observeViewController.addListenersForAllSensorCards() diff --git a/ScienceJournal/UI/ExperimentsListViewController.swift b/ScienceJournal/UI/ExperimentsListViewController.swift index 730c5a75..25472a17 100644 --- a/ScienceJournal/UI/ExperimentsListViewController.swift +++ b/ScienceJournal/UI/ExperimentsListViewController.swift @@ -18,7 +18,6 @@ import UIKit import third_party_objective_c_material_components_ios_components_Buttons_Buttons import third_party_objective_c_material_components_ios_components_Dialogs_Dialogs -import third_party_objective_c_material_components_ios_components_FeatureHighlight_ColorThemer import third_party_objective_c_material_components_ios_components_FeatureHighlight_FeatureHighlight import third_party_objective_c_material_components_ios_components_Palettes_Palettes import third_party_objective_c_material_components_ios_components_Snackbar_Snackbar @@ -385,7 +384,7 @@ class ExperimentsListViewController: MaterialHeaderViewController, ExperimentSta // Unoding an archive or delete is unstable when this view is off screen so dismiss snackbars. [snackbarCategoryArchivedExperiment, snackbarCategoryDeletedExperiment].forEach { - MDCSnackbarManager.dismissAndCallCompletionBlocks(withCategory: $0) + MDCSnackbarManager.default.dismissAndCallCompletionBlocks(withCategory: $0) } // Make sure the highlight doesn't appear when off screen. @@ -618,7 +617,7 @@ class ExperimentsListViewController: MaterialHeaderViewController, ExperimentSta undoBlock: undoBlock) } else { // If the user is unarchiving, hide any archived state undo snackbars. - MDCSnackbarManager.dismissAndCallCompletionBlocks( + MDCSnackbarManager.default.dismissAndCallCompletionBlocks( withCategory: snackbarCategoryArchivedExperiment) } } diff --git a/ScienceJournal/UI/ObserveViewController.swift b/ScienceJournal/UI/ObserveViewController.swift index 43dad47a..e286ee61 100644 --- a/ScienceJournal/UI/ObserveViewController.swift +++ b/ScienceJournal/UI/ObserveViewController.swift @@ -441,9 +441,9 @@ open class ObserveViewController: ScienceJournalCollectionViewController, ChartC // Not all sensors provided a snapshot, show a toast alert. let message = MDCSnackbarMessage() message.text = String.snapshotFailedDisconnected - MDCSnackbarManager.setButtonTitleColor( + MDCSnackbarManager.default.setButtonTitleColor( ArduinoColorPalette.yellowPalette.tint200, for: .normal) - MDCSnackbarManager.show(message) + MDCSnackbarManager.default.show(message) return } self.delegate?.observeViewController(self, didCreateSensorSnapshots: sensorSnapshots) diff --git a/ScienceJournal/UI/Snackbars.swift b/ScienceJournal/UI/Snackbars.swift index eeb03eee..cdd9f81a 100644 --- a/ScienceJournal/UI/Snackbars.swift +++ b/ScienceJournal/UI/Snackbars.swift @@ -63,7 +63,7 @@ func showSnackbar(withMessage messageText: String, message.action = action DispatchQueue.main.async { - MDCSnackbarManager.setButtonTitleColor(MDCPalette.yellow.tint200, for: .normal) - MDCSnackbarManager.show(message) + MDCSnackbarManager.default.setButtonTitleColor(MDCPalette.yellow.tint200, for: .normal) + MDCSnackbarManager.default.show(message) } } diff --git a/ScienceJournal/UI/TrialDetailViewController.swift b/ScienceJournal/UI/TrialDetailViewController.swift index d6869ac9..e4d1724e 100644 --- a/ScienceJournal/UI/TrialDetailViewController.swift +++ b/ScienceJournal/UI/TrialDetailViewController.swift @@ -446,7 +446,7 @@ class TrialDetailViewController: MaterialHeaderViewController, name: UIResponder.keyboardWillHideNotification, object: nil) - MDCSnackbarManager.dismissAndCallCompletionBlocks( + MDCSnackbarManager.default.dismissAndCallCompletionBlocks( withCategory: trialNoteDeleteUndoSnackbarCategory) } From b8fc0bafa081afe43252479e193d441685064eb9 Mon Sep 17 00:00:00 2001 From: Emilio Pavia Date: Fri, 9 Oct 2020 15:21:04 +0200 Subject: [PATCH 2/5] Fix Xcode warnings --- .../ActionArea/ActionAreaController.swift | 6 ++++-- .../CrossDissolveTransitionAnimation.swift | 2 ++ .../ActionArea/FauxdalTransitionAnimation.swift | 2 ++ ScienceJournal/ActionArea/UIKit+ActionArea.swift | 2 ++ .../BLESupport/BLEServiceScanner.swift | 3 +++ .../CaptureSession/CameraAccessHandler.swift | 1 + ScienceJournal/Drive/ExperimentMerger.swift | 2 ++ ...rInformation_TriggerWhen+ScienceJournal.swift | 3 +++ .../Metadata/ExistingDataMigrationManager.swift | 4 ++-- .../Metadata/SensorTriggerEvaluator.swift | 2 ++ .../Operations/GSJOperationQueue.swift | 4 ++-- ScienceJournal/Recording/Recorder.swift | 4 ++++ ScienceJournal/SensorData/UserAssetManager.swift | 4 ++-- .../SharableDocuments/DocumentManager.swift | 16 ++++++++-------- ScienceJournal/UI/TriggerTypeSelectorView.swift | 2 ++ ScienceJournal/UI/TriggerWhenSelectorView.swift | 2 ++ .../WrappedModels/ExperimentChange.swift | 2 ++ ScienceJournal/WrappedModels/Note.swift | 2 ++ ScienceJournal/WrappedModels/SensorTrigger.swift | 2 ++ 19 files changed, 49 insertions(+), 16 deletions(-) diff --git a/ScienceJournal/ActionArea/ActionAreaController.swift b/ScienceJournal/ActionArea/ActionAreaController.swift index f5964662..398f7d05 100644 --- a/ScienceJournal/ActionArea/ActionAreaController.swift +++ b/ScienceJournal/ActionArea/ActionAreaController.swift @@ -149,7 +149,7 @@ extension ActionArea { switch self { case .portrait: return "portrait(\(mode))" - case let .landscape(mode): + case let .landscape(_, mode): return "landscape(\(mode))" } } @@ -983,7 +983,7 @@ private extension ActionArea.Controller { } func animateBarElevation(barIsElevated: Bool) { - guard let master = presentedMasterViewController else { return } + guard presentedMasterViewController != nil else { return } func animate() { if isExpanded { @@ -1131,6 +1131,8 @@ extension ActionArea.Controller: UINavigationControllerDelegate { ) case .push, .pop, .none: return nil + @unknown default: + return nil } } diff --git a/ScienceJournal/ActionArea/CrossDissolveTransitionAnimation.swift b/ScienceJournal/ActionArea/CrossDissolveTransitionAnimation.swift index fc06055a..42d19ffa 100644 --- a/ScienceJournal/ActionArea/CrossDissolveTransitionAnimation.swift +++ b/ScienceJournal/ActionArea/CrossDissolveTransitionAnimation.swift @@ -42,6 +42,8 @@ final class CrossDissolveTransitionAnimation: NSObject, UIViewControllerAnimated animatePush(using: transitionContext) case .pop: animatePop(using: transitionContext) + @unknown default: + transitionContext.completeTransition(false) } } diff --git a/ScienceJournal/ActionArea/FauxdalTransitionAnimation.swift b/ScienceJournal/ActionArea/FauxdalTransitionAnimation.swift index 4b6399df..b1fd69f1 100644 --- a/ScienceJournal/ActionArea/FauxdalTransitionAnimation.swift +++ b/ScienceJournal/ActionArea/FauxdalTransitionAnimation.swift @@ -47,6 +47,8 @@ final class FauxdalTransitionAnimation: NSObject, UIViewControllerAnimatedTransi animatePush(using: transitionContext) case .pop: animatePop(using: transitionContext) + @unknown default: + transitionContext.completeTransition(false) } } diff --git a/ScienceJournal/ActionArea/UIKit+ActionArea.swift b/ScienceJournal/ActionArea/UIKit+ActionArea.swift index d46fea9a..2d44511b 100644 --- a/ScienceJournal/ActionArea/UIKit+ActionArea.swift +++ b/ScienceJournal/ActionArea/UIKit+ActionArea.swift @@ -57,6 +57,8 @@ extension UINavigationController.Operation: CustomStringConvertible { return "push" case .pop: return "pop" + @unknown default: + return "unknown" } } diff --git a/ScienceJournal/BLESupport/BLEServiceScanner.swift b/ScienceJournal/BLESupport/BLEServiceScanner.swift index 3cade776..9d954f64 100644 --- a/ScienceJournal/BLESupport/BLEServiceScanner.swift +++ b/ScienceJournal/BLESupport/BLEServiceScanner.swift @@ -201,6 +201,9 @@ class BLEServiceScanner: NSObject, CBCentralManagerDelegate { print("Bluetooth is powered on.") isBluetoothAvailable = true resumeScanning() + @unknown default: + print("Bluetooth unknown state.") + isBluetoothAvailable = false } if previouslyAvailable != isBluetoothAvailable { diff --git a/ScienceJournal/CaptureSession/CameraAccessHandler.swift b/ScienceJournal/CaptureSession/CameraAccessHandler.swift index 61636ef0..f196b0b8 100644 --- a/ScienceJournal/CaptureSession/CameraAccessHandler.swift +++ b/ScienceJournal/CaptureSession/CameraAccessHandler.swift @@ -35,6 +35,7 @@ class CameraAccessHandler { requestCompletion?(granted) } return false + @unknown default: return false } } diff --git a/ScienceJournal/Drive/ExperimentMerger.swift b/ScienceJournal/Drive/ExperimentMerger.swift index 8a6f8a54..d2096655 100644 --- a/ScienceJournal/Drive/ExperimentMerger.swift +++ b/ScienceJournal/Drive/ExperimentMerger.swift @@ -123,6 +123,7 @@ public class ExperimentMerger { case .note, .caption: handleNoteConflict(externalExperiment: externalExperiment, externalChange: externalChange) case .unknown: break + @unknown default: break } } @@ -136,6 +137,7 @@ public class ExperimentMerger { case .note, .caption: copyNoteChange(externalExperiment: externalExperiment, externalChange: externalChange) case .unknown: break + @unknown default: break } } diff --git a/ScienceJournal/Extensions/GSJTriggerInformation_TriggerWhen+ScienceJournal.swift b/ScienceJournal/Extensions/GSJTriggerInformation_TriggerWhen+ScienceJournal.swift index 54c8cf22..6abee29f 100644 --- a/ScienceJournal/Extensions/GSJTriggerInformation_TriggerWhen+ScienceJournal.swift +++ b/ScienceJournal/Extensions/GSJTriggerInformation_TriggerWhen+ScienceJournal.swift @@ -28,6 +28,7 @@ extension GSJTriggerInformation_TriggerWhen { case .triggerWhenDropsBelow: return String.triggerWhenDroppedBelow.lowercased() case .triggerWhenAbove: return String.triggerWhenIsAbove.lowercased() case .triggerWhenBelow: return String.triggerWhenIsBelow.lowercased() + @unknown default: return "" } } @@ -38,6 +39,8 @@ extension GSJTriggerInformation_TriggerWhen { return true case .triggerWhenAt, .triggerWhenDropsBelow, .triggerWhenRisesAbove: return false + @unknown default: + return false } } diff --git a/ScienceJournal/Metadata/ExistingDataMigrationManager.swift b/ScienceJournal/Metadata/ExistingDataMigrationManager.swift index d55aa366..3be89b27 100644 --- a/ScienceJournal/Metadata/ExistingDataMigrationManager.swift +++ b/ScienceJournal/Metadata/ExistingDataMigrationManager.swift @@ -222,7 +222,7 @@ class ExistingDataMigrationManager { migrateOperations.append(addExperimentAndCleanup) let migrate = GroupOperation(operations: migrateOperations) - migrate.addObserver(BlockObserver { _, _ in + migrate.addObserver(BlockObserver(finishHandler: { _, _ in // Errors var errors = [ExistingDataMigrationManagerError]() if !addExperimentSuccess { @@ -238,7 +238,7 @@ class ExistingDataMigrationManager { DispatchQueue.main.async { completion(errors) } - }) + })) migrate.addObserver(BackgroundTaskObserver()) migrationQueue.addOperation(migrate) diff --git a/ScienceJournal/Metadata/SensorTriggerEvaluator.swift b/ScienceJournal/Metadata/SensorTriggerEvaluator.swift index 9fe897be..4b13c6ab 100644 --- a/ScienceJournal/Metadata/SensorTriggerEvaluator.swift +++ b/ScienceJournal/Metadata/SensorTriggerEvaluator.swift @@ -56,6 +56,8 @@ class SensorTriggerEvaluator { return value < sensorTrigger.triggerInformation.valueToTrigger case .triggerWhenAbove: return value > sensorTrigger.triggerInformation.valueToTrigger + @unknown default: + return false } } self.previousValue = value diff --git a/ScienceJournal/Operations/GSJOperationQueue.swift b/ScienceJournal/Operations/GSJOperationQueue.swift index 50a39baa..bd76bdfd 100644 --- a/ScienceJournal/Operations/GSJOperationQueue.swift +++ b/ScienceJournal/Operations/GSJOperationQueue.swift @@ -79,9 +79,9 @@ open class GSJOperationQueue: OperationQueue { if !concurrencyCategories.isEmpty { let exclusivityController = ExclusivityController.shared exclusivityController.addOperation(gsjOp, categories: concurrencyCategories) - gsjOp.addObserver(BlockObserver { operation, _ in + gsjOp.addObserver(BlockObserver(finishHandler: { operation, _ in exclusivityController.removeOperation(operation, categories: concurrencyCategories) - }) + })) } // Inform the operation it is being enqueued. This is a required step for the operation to diff --git a/ScienceJournal/Recording/Recorder.swift b/ScienceJournal/Recording/Recorder.swift index 754cf3d3..ddfc5d4a 100644 --- a/ScienceJournal/Recording/Recorder.swift +++ b/ScienceJournal/Recording/Recorder.swift @@ -251,8 +251,12 @@ class Recorder: Equatable, SensorTriggerFrequencyObserverDelegate { self.triggerAlertHelper.playTriggerAlertVibration() case .triggerAlertVisual: self.delegate?.recorder(self, didFireVisualTrigger: sensorTrigger) + @unknown default: + break } } + @unknown default: + break } } diff --git a/ScienceJournal/SensorData/UserAssetManager.swift b/ScienceJournal/SensorData/UserAssetManager.swift index d1e2a705..36044c51 100644 --- a/ScienceJournal/SensorData/UserAssetManager.swift +++ b/ScienceJournal/SensorData/UserAssetManager.swift @@ -58,13 +58,13 @@ open class UserAssetManager { WriteTrialSensorDataToDiskOperation(saveFileURL: saveURL, sensorDataManager: sensorDataManager, trial: trial) - writeTrialSensorDataToDiskOperation.addObserver(BlockObserver { + writeTrialSensorDataToDiskOperation.addObserver(BlockObserver(finishHandler: { [unowned self] (operation, _) in if operation.didFinishSuccessfully { self.driveSyncManager?.syncTrialSensorData(atURL: saveURL, experimentID: experiment.ID) } completion?() - }) + })) operationQueue.addOperation(writeTrialSensorDataToDiskOperation) } diff --git a/ScienceJournal/SharableDocuments/DocumentManager.swift b/ScienceJournal/SharableDocuments/DocumentManager.swift index 494ff34a..3a827117 100644 --- a/ScienceJournal/SharableDocuments/DocumentManager.swift +++ b/ScienceJournal/SharableDocuments/DocumentManager.swift @@ -125,7 +125,7 @@ class DocumentManager { experimentURL: newExperimentURL, sensorDataManager: sensorDataManager, metadataManager: metadataManager) - let observer = BlockObserver { (operation, errors) in + let observer = BlockObserver(finishHandler: { (operation, errors) in if !operation.didFinishSuccessfully { self.experimentDataDeleter.permanentlyDeleteExperiment(withID: newExperimentID) @@ -141,7 +141,7 @@ class DocumentManager { object: self, userInfo: userInfo) } - } + }) importDocumentOperation.addObserver(observer) importDocumentOperation.addObserver(BackgroundTaskObserver()) operationQueue.addOperation(importDocumentOperation) @@ -205,7 +205,7 @@ class DocumentManager { experiment: experiment, experimentURL: metadataManager.experimentDirectoryURL(for: experimentID), sensorDataManager: sensorDataManager) - let blockObserver = BlockObserver { (operation, _) in + let blockObserver = BlockObserver(finishHandler: { (operation, _) in DispatchQueue.main.async { guard let documentURL = (operation as? ExportDocumentOperation)?.documentURL else { completion(nil) @@ -213,7 +213,7 @@ class DocumentManager { } completion(documentURL) } - } + }) documentExportOperation.addObserver(blockObserver) documentExportOperation.addObserver(BackgroundTaskObserver()) @@ -273,7 +273,7 @@ extension DocumentManager { experimentURL: newExperimentURL, sensorDataManager: sensorDataManager, metadataManager: metadataManager) - let observer = BlockObserver { (operation, _) in + let observer = BlockObserver(finishHandler: { (operation, _) in if operation.didFinishSuccessfully { self.metadataManager.addImportedExperiment(withID: newExperimentID) @@ -284,16 +284,16 @@ extension DocumentManager { } else { self.experimentDataDeleter.permanentlyDeleteExperiment(withID: newExperimentID) } - } + }) importDocumentOperation.addObserver(observer) importDocumentOperation.addObserver(BackgroundTaskObserver()) importOperations.append(importDocumentOperation) } let groupOperation = GroupOperation(operations: importOperations) - let groupObserver = BlockObserver { (_, _) in + let groupObserver = BlockObserver(finishHandler: { (_, _) in completion?() - } + }) groupOperation.addObserver(groupObserver) operationQueue.addOperation(groupOperation) } diff --git a/ScienceJournal/UI/TriggerTypeSelectorView.swift b/ScienceJournal/UI/TriggerTypeSelectorView.swift index 70c01522..fc2d2d1a 100644 --- a/ScienceJournal/UI/TriggerTypeSelectorView.swift +++ b/ScienceJournal/UI/TriggerTypeSelectorView.swift @@ -70,6 +70,8 @@ class TriggerTypeSelectorView: TriggerOptionSelectorView { selectionLabel.text = String.triggerTypeStartRecording case .triggerActionStopRecording: selectionLabel.text = String.triggerTypeStopRecording + @unknown default: + selectionLabel.text = nil } } diff --git a/ScienceJournal/UI/TriggerWhenSelectorView.swift b/ScienceJournal/UI/TriggerWhenSelectorView.swift index 02a73edf..4c95f612 100644 --- a/ScienceJournal/UI/TriggerWhenSelectorView.swift +++ b/ScienceJournal/UI/TriggerWhenSelectorView.swift @@ -61,6 +61,8 @@ class TriggerWhenSelectorView: TriggerOptionSelectorView { selectionLabel.text = String.triggerWhenDropsBelow case .triggerWhenRisesAbove: selectionLabel.text = String.triggerWhenRisesAbove + @unknown default: + selectionLabel.text = nil } } diff --git a/ScienceJournal/WrappedModels/ExperimentChange.swift b/ScienceJournal/WrappedModels/ExperimentChange.swift index be209f1b..6370a5f2 100644 --- a/ScienceJournal/WrappedModels/ExperimentChange.swift +++ b/ScienceJournal/WrappedModels/ExperimentChange.swift @@ -158,6 +158,7 @@ extension GSJChangedElement_ElementType: CustomDebugStringConvertible { case .note: return ".note" case .caption: return ".caption" case .unknown: return ".unknown" + @unknown default: return ".unknown" } } } @@ -170,6 +171,7 @@ extension GSJChange_ChangeType: CustomDebugStringConvertible { case .modify: return ".modify" case .merge: return ".merge" case .unknown: return ".unknown" + @unknown default: return ".unknown" } } } diff --git a/ScienceJournal/WrappedModels/Note.swift b/ScienceJournal/WrappedModels/Note.swift index 9f203320..8f149408 100644 --- a/ScienceJournal/WrappedModels/Note.swift +++ b/ScienceJournal/WrappedModels/Note.swift @@ -131,6 +131,8 @@ public class Note { return SnapshotNote(proto: labelProto) case .sensorTrigger: return TriggerNote(proto: labelProto) + @unknown default: + return Note(proto: labelProto) } } diff --git a/ScienceJournal/WrappedModels/SensorTrigger.swift b/ScienceJournal/WrappedModels/SensorTrigger.swift index 99194aee..a37f6fe9 100644 --- a/ScienceJournal/WrappedModels/SensorTrigger.swift +++ b/ScienceJournal/WrappedModels/SensorTrigger.swift @@ -79,6 +79,7 @@ class SensorTrigger { case .triggerActionNote: return String.triggerTypeNote case .triggerActionStartRecording: return String.triggerTypeStartRecording case .triggerActionStopRecording: return String.triggerTypeStopRecording + @unknown default: return "" } } @@ -90,6 +91,7 @@ class SensorTrigger { case .triggerWhenBelow: return String.triggerListWhenBelow case .triggerWhenDropsBelow: return String.triggerListWhenDroppingBelow case .triggerWhenRisesAbove: return String.triggerListWhenRisingAbove + @unknown default: return "" } } From c73f3836e0f3fceb09130da1415d0d5f179abf16 Mon Sep 17 00:00:00 2001 From: Emilio Pavia Date: Fri, 9 Oct 2020 16:40:48 +0200 Subject: [PATCH 3/5] Remove Protobuf from FRAMEWORK_SEARCH_PATHS --- ScienceJournal.xcodeproj/project.pbxproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ScienceJournal.xcodeproj/project.pbxproj b/ScienceJournal.xcodeproj/project.pbxproj index e6811cdb..8b0874ae 100644 --- a/ScienceJournal.xcodeproj/project.pbxproj +++ b/ScienceJournal.xcodeproj/project.pbxproj @@ -4279,7 +4279,6 @@ "\"$PODS_CONFIGURATION_BUILD_DIR/MaterialComponents\"", "\"$PODS_CONFIGURATION_BUILD_DIR/MotionAnimator\"", "\"$PODS_CONFIGURATION_BUILD_DIR/MotionInterchange\"", - "\"$PODS_CONFIGURATION_BUILD_DIR/Protobuf\"", ); INFOPLIST_FILE = ScienceJournal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -4448,7 +4447,6 @@ "\"$PODS_CONFIGURATION_BUILD_DIR/MaterialComponents\"", "\"$PODS_CONFIGURATION_BUILD_DIR/MotionAnimator\"", "\"$PODS_CONFIGURATION_BUILD_DIR/MotionInterchange\"", - "\"$PODS_CONFIGURATION_BUILD_DIR/Protobuf\"", ); INFOPLIST_FILE = ScienceJournal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -4696,7 +4694,6 @@ "\"$PODS_CONFIGURATION_BUILD_DIR/MaterialComponents\"", "\"$PODS_CONFIGURATION_BUILD_DIR/MotionAnimator\"", "\"$PODS_CONFIGURATION_BUILD_DIR/MotionInterchange\"", - "\"$PODS_CONFIGURATION_BUILD_DIR/Protobuf\"", ); INFOPLIST_FILE = ScienceJournal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -4774,7 +4771,6 @@ "\"$PODS_CONFIGURATION_BUILD_DIR/MaterialComponents\"", "\"$PODS_CONFIGURATION_BUILD_DIR/MotionAnimator\"", "\"$PODS_CONFIGURATION_BUILD_DIR/MotionInterchange\"", - "\"$PODS_CONFIGURATION_BUILD_DIR/Protobuf\"", ); INFOPLIST_FILE = ScienceJournal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; From b2c8b7c05404b013ff1a710ee7a0720544692afd Mon Sep 17 00:00:00 2001 From: Emilio Pavia Date: Fri, 9 Oct 2020 17:16:02 +0200 Subject: [PATCH 4/5] Remove MDC modulemaps --- .../ActionSheet.modulemaps/module.modulemap | 4 ---- .../ActivityIndicator.modulemaps/module.modulemap | 4 ---- .../AnimationTiming.modulemaps/module.modulemap | 4 ---- .../MDC/AppBar/AppBar.modulemaps/module.modulemap | 4 ---- .../BottomSheet.modulemaps/module.modulemap | 4 ---- .../ButtonBar/ButtonBar.modulemaps/module.modulemap | 4 ---- .../MDC/Buttons/Buttons.modulemaps/module.modulemap | 4 ---- .../CollectionCells.modulemaps/module.modulemap | 4 ---- .../module.modulemap | 4 ---- .../Collections.modulemaps/module.modulemap | 4 ---- .../Dialogs/ColorThemer.modulemaps/module.modulemap | 4 ---- .../MDC/Dialogs/Dialogs.modulemaps/module.modulemap | 4 ---- .../ColorThemer.modulemaps/module.modulemap | 4 ---- .../FeatureHighlight.modulemaps/module.modulemap | 4 ---- .../FlexibleHeader.modulemaps/module.modulemap | 4 ---- .../HeaderStackView.modulemaps/module.modulemap | 4 ---- ModuleMaps/MDC/Ink/Ink.modulemaps/module.modulemap | 4 ---- .../NavigationBar.modulemaps/module.modulemap | 4 ---- .../OverlayWindow.modulemaps/module.modulemap | 4 ---- .../PageControl.modulemaps/module.modulemap | 4 ---- .../MDC/Palettes/Palettes.modulemaps/module.modulemap | 4 ---- .../ProgressView.modulemaps/module.modulemap | 4 ---- .../ShadowElevations.modulemaps/module.modulemap | 4 ---- .../ShadowLayer.modulemaps/module.modulemap | 4 ---- .../MDC/Snackbar/Snackbar.modulemaps/module.modulemap | 4 ---- ModuleMaps/MDC/Tabs/Tabs.modulemaps/module.modulemap | 4 ---- .../TextFields/TextFields.modulemaps/module.modulemap | 4 ---- .../MDC/Themes/Themes.modulemaps/module.modulemap | 4 ---- .../Typography/Typography.modulemaps/module.modulemap | 4 ---- .../Application.modulemaps/module.modulemap | 4 ---- .../private/Icons/Icons.modulemaps/module.modulemap | 4 ---- .../ic_arrow_back.modulemaps/module.modulemap | 4 ---- .../ic_check/ic_check.modulemaps/module.modulemap | 4 ---- .../ic_check_circle.modulemaps/module.modulemap | 4 ---- .../ic_chevron_right.modulemaps/module.modulemap | 4 ---- .../icons/ic_info/ic_info.modulemaps/module.modulemap | 4 ---- .../module.modulemap | 4 ---- .../ic_reorder/ic_reorder.modulemaps/module.modulemap | 4 ---- .../KeyboardWatcher.modulemaps/module.modulemap | 4 ---- .../MDC/private/Math/Math.modulemaps/module.modulemap | 4 ---- .../Overlay/Overlay.modulemaps/module.modulemap | 4 ---- .../UIMetrics/UIMetrics.modulemaps/module.modulemap | 4 ---- .../ActionArea/ActionAreaBarViewController.swift | 4 ++-- .../ExperimentDetailEmptyStateViewController.swift | 2 +- .../MaterialHeaderContainerViewController.swift | 2 +- .../RecordingDetailEmptyStateViewController.swift | 2 +- ScienceJournal/ActionArea/Tinting.swift | 2 +- ScienceJournal/AppDelegate.swift | 2 +- .../BLEArduino/BLEArduinoSensorInterface.swift | 2 +- .../UI/ScienceKitSensorConfigViewController.swift | 4 ++-- .../MakingScienceSensorConfigViewController.swift | 4 ++-- .../MakingScienceSensorInterface.swift | 2 +- ScienceJournal/Chart/ChartController.swift | 2 +- ScienceJournal/Chart/ChartOptions.swift | 2 +- ScienceJournal/Chart/ChartStatsOverlayView.swift | 2 +- ScienceJournal/Chart/ChartView.swift | 2 +- ScienceJournal/Chart/DataPointFlagView.swift | 2 +- .../Extensions/MDCAppBar+ScienceJournal.swift | 2 +- .../Extensions/MDCPalette+ScienceJournal.swift | 2 +- .../Extensions/MDCTabBar+ScienceJournal.swift | 2 +- ScienceJournal/Extensions/UIColor+ScienceJournal.swift | 2 +- .../Launch/LaunchFailureViewController.swift | 4 ++-- ScienceJournal/Metadata/MetadataManager.swift | 2 +- .../PDFExport/PDFExportOverlayViewController.swift | 2 +- .../SharableDocuments/FileTypeSelectionHandler.swift | 2 +- .../SharableDocuments/SaveToFilesHandler.swift | 2 +- ScienceJournal/UI/AboutViewController.swift | 2 +- ScienceJournal/UI/ActionBar.swift | 2 +- ScienceJournal/UI/AddExperimentsToDriveView.swift | 2 +- ScienceJournal/UI/AddTrialNoteViewController.swift | 4 ++-- ScienceJournal/UI/AppFlowViewController.swift | 2 +- ScienceJournal/UI/ArchiveFlagView.swift | 4 ++-- ScienceJournal/UI/ArchivedFlagCell.swift | 4 ++-- ScienceJournal/UI/ButtonViewController.swift | 2 +- ScienceJournal/UI/CameraActionBar.swift | 2 +- ScienceJournal/UI/CameraViewController.swift | 2 +- ScienceJournal/UI/ChartExportViewController.swift | 2 +- ScienceJournal/UI/ClaimExperimentListCell.swift | 4 ++-- ScienceJournal/UI/ClaimExperimentsView.swift | 6 +++--- ScienceJournal/UI/ClaimExperimentsViewController.swift | 2 +- ScienceJournal/UI/CropOverlayView.swift | 2 +- ScienceJournal/UI/CropOverlayViewController.swift | 2 +- ScienceJournal/UI/CropRangeViewController.swift | 2 +- ScienceJournal/UI/CurrentValueView.swift | 4 ++-- ScienceJournal/UI/DisabledInputView.swift | 6 +++--- ScienceJournal/UI/DrawerView.swift | 4 ++-- ScienceJournal/UI/EditExperimentPhotoView.swift | 2 +- ScienceJournal/UI/EditExperimentViewController.swift | 8 +++----- ScienceJournal/UI/EditTimestampView.swift | 8 ++++---- ScienceJournal/UI/EditTimestampViewController.swift | 2 +- ScienceJournal/UI/EmptyView.swift | 4 ++-- ScienceJournal/UI/ErrorDialog.swift | 2 +- ScienceJournal/UI/ExistingDataOptionsCell.swift | 2 +- ScienceJournal/UI/ExistingDataOptionsHeaderView.swift | 2 +- .../UI/ExistingDataOptionsViewController.swift | 6 +++--- ScienceJournal/UI/ExperimentCardCaptionView.swift | 4 ++-- ScienceJournal/UI/ExperimentCardHeaderView.swift | 6 +++--- ScienceJournal/UI/ExperimentCardView.swift | 4 ++-- .../UI/ExperimentCoordinatorViewController.swift | 8 +++----- ScienceJournal/UI/ExperimentDisplay.swift | 2 +- ScienceJournal/UI/ExperimentItemsViewController.swift | 4 ++-- ScienceJournal/UI/ExperimentsListCellBase.swift | 2 +- ScienceJournal/UI/ExperimentsListHeaderView.swift | 4 ++-- .../UI/ExperimentsListItemsViewController.swift | 4 ++-- ScienceJournal/UI/ExperimentsListViewController.swift | 10 +++++----- ScienceJournal/UI/JumpToNowButton.swift | 4 ++-- ScienceJournal/UI/LearnMoreViewController.swift | 2 +- ScienceJournal/UI/LicensesViewController.swift | 2 +- ScienceJournal/UI/MaterialBarButtonItem.swift | 2 +- ScienceJournal/UI/MaterialFloatingSpinner.swift | 4 ++-- .../UI/MaterialHeaderCollectionViewController.swift | 7 +++---- ScienceJournal/UI/MaterialHeaderViewController.swift | 5 ++--- ScienceJournal/UI/MenuButton.swift | 2 +- ScienceJournal/UI/NoteDetailEditCaptionCell.swift | 4 ++-- ScienceJournal/UI/NoteMetadataDetailCell.swift | 4 ++-- ScienceJournal/UI/NoteMetadataDetailHeaderView.swift | 4 ++-- ScienceJournal/UI/NotesView.swift | 6 +++--- ScienceJournal/UI/ObserveDataSource.swift | 2 +- ScienceJournal/UI/ObserveFooterCell.swift | 2 +- ScienceJournal/UI/ObserveViewController.swift | 9 ++++----- ScienceJournal/UI/OnboardingViewController.swift | 6 +++--- ScienceJournal/UI/OptionSelectorView.swift | 6 +++--- ScienceJournal/UI/PermissionsGuideViewController.swift | 6 +++--- ScienceJournal/UI/PhotoLibraryCell.swift | 2 +- ScienceJournal/UI/PhotoLibraryViewController.swift | 2 +- ScienceJournal/UI/PictureCardView.swift | 2 +- ScienceJournal/UI/PictureDetailViewController.swift | 6 ++---- ScienceJournal/UI/PictureInfoViewController.swift | 2 +- ScienceJournal/UI/PitchSensorAnimationView.swift | 2 +- ScienceJournal/UI/PlaybackOverlayView.swift | 2 +- ScienceJournal/UI/PlaybackViewController.swift | 2 +- ScienceJournal/UI/PopUpMenuAction+CommonActions.swift | 2 +- ScienceJournal/UI/PopUpMenuCell.swift | 4 ++-- ScienceJournal/UI/PopUpMenuViewController.swift | 2 +- ScienceJournal/UI/RecordButtonView.swift | 4 ++-- ScienceJournal/UI/RecordingAnimatedView.swift | 2 +- ScienceJournal/UI/RenameViewController.swift | 6 +++--- ScienceJournal/UI/RotatingExpandButton.swift | 2 +- ScienceJournal/UI/ScienceJournalViewControllers.swift | 2 +- ScienceJournal/UI/SensorCard.swift | 2 +- ScienceJournal/UI/SensorCardCell.swift | 4 ++-- ScienceJournal/UI/SensorCardHeaderView.swift | 2 +- ScienceJournal/UI/SensorFailedView.swift | 6 +++--- ScienceJournal/UI/SensorLoadingView.swift | 4 ++-- ScienceJournal/UI/SensorPickerView.swift | 4 ++-- ScienceJournal/UI/SensorSettingsCell.swift | 8 ++++---- ScienceJournal/UI/SensorSettingsDataSource.swift | 2 +- ScienceJournal/UI/SensorSettingsViewController.swift | 4 ++-- ScienceJournal/UI/SensorStatType.swift | 2 +- ScienceJournal/UI/SeparatorView.swift | 2 +- ScienceJournal/UI/SettingsButtonCell.swift | 6 +++--- ScienceJournal/UI/SettingsCell.swift | 2 +- ScienceJournal/UI/SettingsSwitchCell.swift | 2 +- ScienceJournal/UI/SettingsViewController.swift | 4 ++-- ScienceJournal/UI/ShadowedView.swift | 2 +- ScienceJournal/UI/SidebarAccountView.swift | 4 ++-- ScienceJournal/UI/SidebarCell.swift | 4 ++-- ScienceJournal/UI/SidebarHeaderCell.swift | 2 +- ScienceJournal/UI/SignInViewController.swift | 6 +++--- ScienceJournal/UI/Snackbars.swift | 4 ++-- ScienceJournal/UI/SnapshotCardView.swift | 4 ++-- ScienceJournal/UI/SnapshotDetailViewController.swift | 2 +- ScienceJournal/UI/StatView.swift | 4 ++-- ScienceJournal/UI/TextNoteCardView.swift | 4 ++-- ScienceJournal/UI/TextNoteDetailViewController.swift | 3 +-- ScienceJournal/UI/TimeSelectionView.swift | 6 +++--- ScienceJournal/UI/TimerView.swift | 4 ++-- ScienceJournal/UI/TrialCardHeaderView.swift | 2 +- ScienceJournal/UI/TrialCardMoreNotesView.swift | 4 ++-- ScienceJournal/UI/TrialCardSensorView.swift | 2 +- ScienceJournal/UI/TrialDetailAddNoteCell.swift | 4 ++-- ScienceJournal/UI/TrialDetailHeaderCell.swift | 4 ++-- ScienceJournal/UI/TrialDetailSensorsView.swift | 6 +++--- ScienceJournal/UI/TrialDetailViewController.swift | 10 ++++------ .../UI/TrialShareSettingsViewController.swift | 6 +++--- ScienceJournal/UI/TriggerCardView.swift | 4 ++-- ScienceJournal/UI/TriggerDetailViewController.swift | 2 +- ScienceJournal/UI/TriggerEditSectionHeaderView.swift | 4 ++-- ScienceJournal/UI/TriggerListCell.swift | 4 ++-- ScienceJournal/UI/TriggerListViewController.swift | 8 ++++---- ScienceJournal/UI/TriggerOptionEntryView.swift | 6 +++--- ScienceJournal/UI/TriggerOptionSwitchView.swift | 2 +- ScienceJournal/UI/TriggerTypeSelectorView.swift | 2 +- ScienceJournal/UI/TriggerValueEntryView.swift | 4 ++-- .../UI/UIViewController+MaterialHeader.swift | 2 +- ScienceJournal/UI/UserFlowViewController.swift | 3 +-- ScienceJournal/UI/ViewConstants.swift | 4 ++-- .../UI/VisibilityTrackingViewControllers.swift | 2 +- .../UI/VisualTriggerView+TriggerFiredView.swift | 4 ++-- ScienceJournal/UI/VisualTriggerView.swift | 4 ++-- ScienceJournal/UI/WelcomeViewController.swift | 6 +++--- ScienceJournal/ViewData/DisplayTrialViewData.swift | 2 +- ScienceJournal/WrappedModels/ExperimentOverview.swift | 2 +- ScienceJournal/WrappedModels/SensorLayout.swift | 2 +- ScienceJournalTests/Chart/ChartControllerTest.swift | 2 +- .../Extensions/MDCPalette+ScienceJournalTest.swift | 2 +- ScienceJournalTests/Metadata/MetadataManagerTest.swift | 2 +- .../ExportExperimentSensorDataOperationTest.swift | 2 +- ScienceJournalTests/UI/NoteDetailControllerTest.swift | 2 +- .../WrappedModels/SensorLayoutTest.swift | 2 +- 200 files changed, 264 insertions(+), 445 deletions(-) delete mode 100755 ModuleMaps/MDC/ActionSheet/ActionSheet.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/ActivityIndicator/ActivityIndicator.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/AnimationTiming/AnimationTiming.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/AppBar/AppBar.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/BottomSheet/BottomSheet.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/ButtonBar/ButtonBar.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/Buttons/Buttons.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/CollectionCells/CollectionCells.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/CollectionLayoutAttributes/CollectionLayoutAttributes.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/Collections/Collections.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/Dialogs/ColorThemer.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/Dialogs/Dialogs.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/FeatureHighlight/ColorThemer.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/FeatureHighlight/FeatureHighlight.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/FlexibleHeader/FlexibleHeader.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/HeaderStackView/HeaderStackView.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/Ink/Ink.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/NavigationBar/NavigationBar.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/OverlayWindow/OverlayWindow.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/PageControl/PageControl.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/Palettes/Palettes.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/ProgressView/ProgressView.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/ShadowElevations/ShadowElevations.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/ShadowLayer/ShadowLayer.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/Snackbar/Snackbar.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/Tabs/Tabs.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/TextFields/TextFields.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/Themes/Themes.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/Typography/Typography.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/private/Application/Application.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/private/Icons/Icons.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/private/Icons/icons/ic_arrow_back/ic_arrow_back.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/private/Icons/icons/ic_check/ic_check.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/private/Icons/icons/ic_check_circle/ic_check_circle.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/private/Icons/icons/ic_chevron_right/ic_chevron_right.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/private/Icons/icons/ic_info/ic_info.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/private/Icons/icons/ic_radio_button_unchecked/ic_radio_button_unchecked.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/private/Icons/icons/ic_reorder/ic_reorder.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/private/KeyboardWatcher/KeyboardWatcher.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/private/Math/Math.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/private/Overlay/Overlay.modulemaps/module.modulemap delete mode 100755 ModuleMaps/MDC/private/UIMetrics/UIMetrics.modulemaps/module.modulemap diff --git a/ModuleMaps/MDC/ActionSheet/ActionSheet.modulemaps/module.modulemap b/ModuleMaps/MDC/ActionSheet/ActionSheet.modulemaps/module.modulemap deleted file mode 100755 index 55aed6e0..00000000 --- a/ModuleMaps/MDC/ActionSheet/ActionSheet.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_ActionSheet_ActionSheet" { - export * - header "../../../../Pods/MaterialComponents/components/ActionSheet/src/MaterialActionSheet.h" -} diff --git a/ModuleMaps/MDC/ActivityIndicator/ActivityIndicator.modulemaps/module.modulemap b/ModuleMaps/MDC/ActivityIndicator/ActivityIndicator.modulemaps/module.modulemap deleted file mode 100755 index 1a060ece..00000000 --- a/ModuleMaps/MDC/ActivityIndicator/ActivityIndicator.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_ActivityIndicator_ActivityIndicator" { - export * - header "../../../../Pods/MaterialComponents/components/ActivityIndicator/src/MaterialActivityIndicator.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/AnimationTiming/AnimationTiming.modulemaps/module.modulemap b/ModuleMaps/MDC/AnimationTiming/AnimationTiming.modulemaps/module.modulemap deleted file mode 100755 index fbdef487..00000000 --- a/ModuleMaps/MDC/AnimationTiming/AnimationTiming.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_AnimationTiming_AnimationTiming" { - export * - header "../../../../Pods/MaterialComponents/components/AnimationTiming/src/MaterialAnimationTiming.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/AppBar/AppBar.modulemaps/module.modulemap b/ModuleMaps/MDC/AppBar/AppBar.modulemaps/module.modulemap deleted file mode 100755 index 4d86dfd7..00000000 --- a/ModuleMaps/MDC/AppBar/AppBar.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_AppBar_AppBar" { - export * - header "../../../../Pods/MaterialComponents/components/AppBar/src/MaterialAppBar.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/BottomSheet/BottomSheet.modulemaps/module.modulemap b/ModuleMaps/MDC/BottomSheet/BottomSheet.modulemaps/module.modulemap deleted file mode 100755 index c89b49c0..00000000 --- a/ModuleMaps/MDC/BottomSheet/BottomSheet.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_BottomSheet_BottomSheet" { - export * - header "../../../../Pods/MaterialComponents/components/BottomSheet/src/MaterialBottomSheet.h" -} diff --git a/ModuleMaps/MDC/ButtonBar/ButtonBar.modulemaps/module.modulemap b/ModuleMaps/MDC/ButtonBar/ButtonBar.modulemaps/module.modulemap deleted file mode 100755 index 93cd7812..00000000 --- a/ModuleMaps/MDC/ButtonBar/ButtonBar.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_ButtonBar_ButtonBar" { - export * - header "../../../../Pods/MaterialComponents/components/ButtonBar/src/MaterialButtonBar.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/Buttons/Buttons.modulemaps/module.modulemap b/ModuleMaps/MDC/Buttons/Buttons.modulemaps/module.modulemap deleted file mode 100755 index fcd2ddad..00000000 --- a/ModuleMaps/MDC/Buttons/Buttons.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_Buttons_Buttons" { - export * - header "../../../../Pods/MaterialComponents/components/Buttons/src/MaterialButtons.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/CollectionCells/CollectionCells.modulemaps/module.modulemap b/ModuleMaps/MDC/CollectionCells/CollectionCells.modulemaps/module.modulemap deleted file mode 100755 index 3a9fa09b..00000000 --- a/ModuleMaps/MDC/CollectionCells/CollectionCells.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_CollectionCells_CollectionCells" { - export * - header "../../../../Pods/MaterialComponents/components/CollectionCells/src/MaterialCollectionCells.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/CollectionLayoutAttributes/CollectionLayoutAttributes.modulemaps/module.modulemap b/ModuleMaps/MDC/CollectionLayoutAttributes/CollectionLayoutAttributes.modulemaps/module.modulemap deleted file mode 100755 index 9372d374..00000000 --- a/ModuleMaps/MDC/CollectionLayoutAttributes/CollectionLayoutAttributes.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_CollectionLayoutAttributes_CollectionLayoutAttributes" { - export * - header "../../../../Pods/MaterialComponents/components/CollectionLayoutAttributes/src/MaterialCollectionLayoutAttributes.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/Collections/Collections.modulemaps/module.modulemap b/ModuleMaps/MDC/Collections/Collections.modulemaps/module.modulemap deleted file mode 100755 index 06474af1..00000000 --- a/ModuleMaps/MDC/Collections/Collections.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_Collections_Collections" { - export * - header "../../../../Pods/MaterialComponents/components/Collections/src/MaterialCollections.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/Dialogs/ColorThemer.modulemaps/module.modulemap b/ModuleMaps/MDC/Dialogs/ColorThemer.modulemaps/module.modulemap deleted file mode 100755 index d7ee4bad..00000000 --- a/ModuleMaps/MDC/Dialogs/ColorThemer.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_Dialogs_ColorThemer" { - export * - header "../../../../Pods/MaterialComponents/components/Dialogs/src/ColorThemer/MaterialDialogs+ColorThemer.h" -} diff --git a/ModuleMaps/MDC/Dialogs/Dialogs.modulemaps/module.modulemap b/ModuleMaps/MDC/Dialogs/Dialogs.modulemaps/module.modulemap deleted file mode 100755 index 00450949..00000000 --- a/ModuleMaps/MDC/Dialogs/Dialogs.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_Dialogs_Dialogs" { - export * - header "../../../../Pods/MaterialComponents/components/Dialogs/src/MaterialDialogs.h" -} diff --git a/ModuleMaps/MDC/FeatureHighlight/ColorThemer.modulemaps/module.modulemap b/ModuleMaps/MDC/FeatureHighlight/ColorThemer.modulemaps/module.modulemap deleted file mode 100755 index d0d93170..00000000 --- a/ModuleMaps/MDC/FeatureHighlight/ColorThemer.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_FeatureHighlight_ColorThemer" { - export * - header "../../../../Pods/MaterialComponents/components/FeatureHighlight/src/ColorThemer/MaterialFeatureHighlight+ColorThemer.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/FeatureHighlight/FeatureHighlight.modulemaps/module.modulemap b/ModuleMaps/MDC/FeatureHighlight/FeatureHighlight.modulemaps/module.modulemap deleted file mode 100755 index 1223fcaf..00000000 --- a/ModuleMaps/MDC/FeatureHighlight/FeatureHighlight.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_FeatureHighlight_FeatureHighlight" { - export * - header "../../../../Pods/MaterialComponents/components/FeatureHighlight/src/MaterialFeatureHighlight.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/FlexibleHeader/FlexibleHeader.modulemaps/module.modulemap b/ModuleMaps/MDC/FlexibleHeader/FlexibleHeader.modulemaps/module.modulemap deleted file mode 100755 index f5228626..00000000 --- a/ModuleMaps/MDC/FlexibleHeader/FlexibleHeader.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_FlexibleHeader_FlexibleHeader" { - export * - header "../../../../Pods/MaterialComponents/components/FlexibleHeader/src/MaterialFlexibleHeader.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/HeaderStackView/HeaderStackView.modulemaps/module.modulemap b/ModuleMaps/MDC/HeaderStackView/HeaderStackView.modulemaps/module.modulemap deleted file mode 100755 index 735cb694..00000000 --- a/ModuleMaps/MDC/HeaderStackView/HeaderStackView.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_HeaderStackView_HeaderStackView" { - export * - header "../../../../Pods/MaterialComponents/components/HeaderStackView/src/MaterialHeaderStackView.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/Ink/Ink.modulemaps/module.modulemap b/ModuleMaps/MDC/Ink/Ink.modulemaps/module.modulemap deleted file mode 100755 index fe663d31..00000000 --- a/ModuleMaps/MDC/Ink/Ink.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_Ink_Ink" { - export * - header "../../../../Pods/MaterialComponents/components/Ink/src/MaterialInk.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/NavigationBar/NavigationBar.modulemaps/module.modulemap b/ModuleMaps/MDC/NavigationBar/NavigationBar.modulemaps/module.modulemap deleted file mode 100755 index f6831fd7..00000000 --- a/ModuleMaps/MDC/NavigationBar/NavigationBar.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_NavigationBar_NavigationBar" { - export * - header "../../../../Pods/MaterialComponents/components/NavigationBar/src/MaterialNavigationBar.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/OverlayWindow/OverlayWindow.modulemaps/module.modulemap b/ModuleMaps/MDC/OverlayWindow/OverlayWindow.modulemaps/module.modulemap deleted file mode 100755 index 657d4ea5..00000000 --- a/ModuleMaps/MDC/OverlayWindow/OverlayWindow.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_OverlayWindow_OverlayWindow" { - export * - header "../../../../Pods/MaterialComponents/components/OverlayWindow/src/MaterialOverlayWindow.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/PageControl/PageControl.modulemaps/module.modulemap b/ModuleMaps/MDC/PageControl/PageControl.modulemaps/module.modulemap deleted file mode 100755 index 6a55345d..00000000 --- a/ModuleMaps/MDC/PageControl/PageControl.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_PageControl_PageControl" { - export * - header "../../../../Pods/MaterialComponents/components/PageControl/src/MaterialPageControl.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/Palettes/Palettes.modulemaps/module.modulemap b/ModuleMaps/MDC/Palettes/Palettes.modulemaps/module.modulemap deleted file mode 100755 index 3756a730..00000000 --- a/ModuleMaps/MDC/Palettes/Palettes.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_Palettes_Palettes" { - export * - header "../../../../Pods/MaterialComponents/components/Palettes/src/MaterialPalettes.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/ProgressView/ProgressView.modulemaps/module.modulemap b/ModuleMaps/MDC/ProgressView/ProgressView.modulemaps/module.modulemap deleted file mode 100755 index fa838fb2..00000000 --- a/ModuleMaps/MDC/ProgressView/ProgressView.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_ProgressView_ProgressView" { - export * - header "../../../../Pods/MaterialComponents/components/ProgressView/src/MaterialProgressView.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/ShadowElevations/ShadowElevations.modulemaps/module.modulemap b/ModuleMaps/MDC/ShadowElevations/ShadowElevations.modulemaps/module.modulemap deleted file mode 100755 index ee11e365..00000000 --- a/ModuleMaps/MDC/ShadowElevations/ShadowElevations.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_ShadowElevations_ShadowElevations" { - export * - header "../../../../Pods/MaterialComponents/components/ShadowElevations/src/MaterialShadowElevations.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/ShadowLayer/ShadowLayer.modulemaps/module.modulemap b/ModuleMaps/MDC/ShadowLayer/ShadowLayer.modulemaps/module.modulemap deleted file mode 100755 index 246eb48c..00000000 --- a/ModuleMaps/MDC/ShadowLayer/ShadowLayer.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_ShadowLayer_ShadowLayer" { - export * - header "../../../../Pods/MaterialComponents/components/ShadowLayer/src/MaterialShadowLayer.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/Snackbar/Snackbar.modulemaps/module.modulemap b/ModuleMaps/MDC/Snackbar/Snackbar.modulemaps/module.modulemap deleted file mode 100755 index b85283b3..00000000 --- a/ModuleMaps/MDC/Snackbar/Snackbar.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_Snackbar_Snackbar" { - export * - header "../../../../Pods/MaterialComponents/components/Snackbar/src/MaterialSnackbar.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/Tabs/Tabs.modulemaps/module.modulemap b/ModuleMaps/MDC/Tabs/Tabs.modulemaps/module.modulemap deleted file mode 100755 index 0b36a1c0..00000000 --- a/ModuleMaps/MDC/Tabs/Tabs.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_Tabs_Tabs" { - export * - header "../../../../Pods/MaterialComponents/components/Tabs/src/MaterialTabs.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/TextFields/TextFields.modulemaps/module.modulemap b/ModuleMaps/MDC/TextFields/TextFields.modulemaps/module.modulemap deleted file mode 100755 index 11f5db49..00000000 --- a/ModuleMaps/MDC/TextFields/TextFields.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_TextFields_TextFields" { - export * - header "../../../../Pods/MaterialComponents/components/TextFields/src/MaterialTextFields.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/Themes/Themes.modulemaps/module.modulemap b/ModuleMaps/MDC/Themes/Themes.modulemaps/module.modulemap deleted file mode 100755 index 141ab727..00000000 --- a/ModuleMaps/MDC/Themes/Themes.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_Themes_Themes" { - export * - header "../../../../Pods/MaterialComponents/components/Themes/src/MaterialThemes.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/Typography/Typography.modulemaps/module.modulemap b/ModuleMaps/MDC/Typography/Typography.modulemaps/module.modulemap deleted file mode 100755 index 3dc6553e..00000000 --- a/ModuleMaps/MDC/Typography/Typography.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_Typography_Typography" { - export * - header "../../../../Pods/MaterialComponents/components/Typography/src/MaterialTypography.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/private/Application/Application.modulemaps/module.modulemap b/ModuleMaps/MDC/private/Application/Application.modulemaps/module.modulemap deleted file mode 100755 index 8c68d98f..00000000 --- a/ModuleMaps/MDC/private/Application/Application.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_private_Application_Application" { - export * - header "../../../../../Pods/MaterialComponents/components/private/Application/src/MaterialApplication.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/private/Icons/Icons.modulemaps/module.modulemap b/ModuleMaps/MDC/private/Icons/Icons.modulemaps/module.modulemap deleted file mode 100755 index 9f2e3c0b..00000000 --- a/ModuleMaps/MDC/private/Icons/Icons.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_private_Icons_Icons" { - export * - header "../../../../../Pods/MaterialComponents/components/private/Icons/src/MaterialIcons.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/private/Icons/icons/ic_arrow_back/ic_arrow_back.modulemaps/module.modulemap b/ModuleMaps/MDC/private/Icons/icons/ic_arrow_back/ic_arrow_back.modulemaps/module.modulemap deleted file mode 100755 index 029edd9e..00000000 --- a/ModuleMaps/MDC/private/Icons/icons/ic_arrow_back/ic_arrow_back.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_private_Icons_icons_ic_arrow_back_ic_arrow_back" { - export * - header "../../../../../../../Pods/MaterialComponents/components/private/Icons/icons/ic_arrow_back/src/MaterialIcons+ic_arrow_back.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/private/Icons/icons/ic_check/ic_check.modulemaps/module.modulemap b/ModuleMaps/MDC/private/Icons/icons/ic_check/ic_check.modulemaps/module.modulemap deleted file mode 100755 index 975f17f4..00000000 --- a/ModuleMaps/MDC/private/Icons/icons/ic_check/ic_check.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_private_Icons_icons_ic_check_ic_check" { - export * - header "../../../../../../../Pods/MaterialComponents/components/private/Icons/icons/ic_check/src/MaterialIcons+ic_check.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/private/Icons/icons/ic_check_circle/ic_check_circle.modulemaps/module.modulemap b/ModuleMaps/MDC/private/Icons/icons/ic_check_circle/ic_check_circle.modulemaps/module.modulemap deleted file mode 100755 index 6fc24a58..00000000 --- a/ModuleMaps/MDC/private/Icons/icons/ic_check_circle/ic_check_circle.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_private_Icons_icons_ic_check_circle_ic_check_circle" { - export * - header "../../../../../../../Pods/MaterialComponents/components/private/Icons/icons/ic_check_circle/src/MaterialIcons+ic_check_circle.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/private/Icons/icons/ic_chevron_right/ic_chevron_right.modulemaps/module.modulemap b/ModuleMaps/MDC/private/Icons/icons/ic_chevron_right/ic_chevron_right.modulemaps/module.modulemap deleted file mode 100755 index 82a5045e..00000000 --- a/ModuleMaps/MDC/private/Icons/icons/ic_chevron_right/ic_chevron_right.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_private_Icons_icons_ic_chevron_right_ic_chevron_right" { - export * - header "../../../../../../../Pods/MaterialComponents/components/private/Icons/icons/ic_chevron_right/src/MaterialIcons+ic_chevron_right.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/private/Icons/icons/ic_info/ic_info.modulemaps/module.modulemap b/ModuleMaps/MDC/private/Icons/icons/ic_info/ic_info.modulemaps/module.modulemap deleted file mode 100755 index c5a84e74..00000000 --- a/ModuleMaps/MDC/private/Icons/icons/ic_info/ic_info.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_private_Icons_icons_ic_info_ic_info" { - export * - header "../../../../../../../Pods/MaterialComponents/components/private/Icons/icons/ic_info/src/MaterialIcons+ic_info.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/private/Icons/icons/ic_radio_button_unchecked/ic_radio_button_unchecked.modulemaps/module.modulemap b/ModuleMaps/MDC/private/Icons/icons/ic_radio_button_unchecked/ic_radio_button_unchecked.modulemaps/module.modulemap deleted file mode 100755 index ada32b3c..00000000 --- a/ModuleMaps/MDC/private/Icons/icons/ic_radio_button_unchecked/ic_radio_button_unchecked.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_private_Icons_icons_ic_radio_button_unchecked_ic_radio_button_unchecked" { - export * - header "../../../../../../../Pods/MaterialComponents/components/private/Icons/icons/ic_radio_button_unchecked/src/MaterialIcons+ic_radio_button_unchecked.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/private/Icons/icons/ic_reorder/ic_reorder.modulemaps/module.modulemap b/ModuleMaps/MDC/private/Icons/icons/ic_reorder/ic_reorder.modulemaps/module.modulemap deleted file mode 100755 index b333ed53..00000000 --- a/ModuleMaps/MDC/private/Icons/icons/ic_reorder/ic_reorder.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_private_Icons_icons_ic_reorder_ic_reorder" { - export * - header "../../../../../../../Pods/MaterialComponents/components/private/Icons/icons/ic_reorder/src/MaterialIcons+ic_reorder.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/private/KeyboardWatcher/KeyboardWatcher.modulemaps/module.modulemap b/ModuleMaps/MDC/private/KeyboardWatcher/KeyboardWatcher.modulemaps/module.modulemap deleted file mode 100755 index f846900c..00000000 --- a/ModuleMaps/MDC/private/KeyboardWatcher/KeyboardWatcher.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_private_KeyboardWatcher_KeyboardWatcher" { - export * - header "../../../../../Pods/MaterialComponents/components/private/KeyboardWatcher/src/MaterialKeyboardWatcher.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/private/Math/Math.modulemaps/module.modulemap b/ModuleMaps/MDC/private/Math/Math.modulemaps/module.modulemap deleted file mode 100755 index d17ed7ed..00000000 --- a/ModuleMaps/MDC/private/Math/Math.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_private_Math_Math" { - export * - header "../../../../../Pods/MaterialComponents/components/private/Math/src/MaterialMath.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/private/Overlay/Overlay.modulemaps/module.modulemap b/ModuleMaps/MDC/private/Overlay/Overlay.modulemaps/module.modulemap deleted file mode 100755 index fde6529b..00000000 --- a/ModuleMaps/MDC/private/Overlay/Overlay.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_private_Overlay_Overlay" { - export * - header "../../../../../Pods/MaterialComponents/components/private/Overlay/src/MaterialOverlay.h" -} \ No newline at end of file diff --git a/ModuleMaps/MDC/private/UIMetrics/UIMetrics.modulemaps/module.modulemap b/ModuleMaps/MDC/private/UIMetrics/UIMetrics.modulemaps/module.modulemap deleted file mode 100755 index b0d93501..00000000 --- a/ModuleMaps/MDC/private/UIMetrics/UIMetrics.modulemaps/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module "third_party_objective_c_material_components_ios_components_private_UIMetrics_UIMetrics" { - export * - header "../../../../../Pods/MaterialComponents/components/private/UIMetrics/src/MaterialUIMetrics.h" -} \ No newline at end of file diff --git a/ScienceJournal/ActionArea/ActionAreaBarViewController.swift b/ScienceJournal/ActionArea/ActionAreaBarViewController.swift index de4c1caf..b2a29757 100644 --- a/ScienceJournal/ActionArea/ActionAreaBarViewController.swift +++ b/ScienceJournal/ActionArea/ActionAreaBarViewController.swift @@ -17,8 +17,8 @@ import SnapKit import UIKit -import third_party_objective_c_material_components_ios_components_ButtonBar_ButtonBar -import third_party_objective_c_material_components_ios_components_ShadowLayer_ShadowLayer +import MaterialComponents.MaterialButtonBar +import MaterialComponents.MaterialShadowLayer // MARK: - ActionArea.BarViewController diff --git a/ScienceJournal/ActionArea/ExperimentDetailEmptyStateViewController.swift b/ScienceJournal/ActionArea/ExperimentDetailEmptyStateViewController.swift index 6e2afc0a..a55a2601 100644 --- a/ScienceJournal/ActionArea/ExperimentDetailEmptyStateViewController.swift +++ b/ScienceJournal/ActionArea/ExperimentDetailEmptyStateViewController.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography // TODO: This VC still needs a final image. final class ExperimentDetailEmptyStateViewController: UIViewController { diff --git a/ScienceJournal/ActionArea/MaterialHeaderContainerViewController.swift b/ScienceJournal/ActionArea/MaterialHeaderContainerViewController.swift index ef8d9b86..24bceb64 100644 --- a/ScienceJournal/ActionArea/MaterialHeaderContainerViewController.swift +++ b/ScienceJournal/ActionArea/MaterialHeaderContainerViewController.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_AppBar_AppBar +import MaterialComponents.MaterialAppBar // TODO: Ensure this handles existing issues or use one of the other superclasses. // TODO: Consider making this private and wrapping content VCs that are not subclasses diff --git a/ScienceJournal/ActionArea/RecordingDetailEmptyStateViewController.swift b/ScienceJournal/ActionArea/RecordingDetailEmptyStateViewController.swift index f99269e1..86e2ee63 100644 --- a/ScienceJournal/ActionArea/RecordingDetailEmptyStateViewController.swift +++ b/ScienceJournal/ActionArea/RecordingDetailEmptyStateViewController.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography // TODO: This VC still needs a final image. // This VC represents the empty state detail view controller when the user is viewing the trial diff --git a/ScienceJournal/ActionArea/Tinting.swift b/ScienceJournal/ActionArea/Tinting.swift index 8d0cb521..bdfd3a7f 100644 --- a/ScienceJournal/ActionArea/Tinting.swift +++ b/ScienceJournal/ActionArea/Tinting.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_AppBar_AppBar +import MaterialComponents.MaterialAppBar /// Custom tint colors. class CustomTint: NSObject { diff --git a/ScienceJournal/AppDelegate.swift b/ScienceJournal/AppDelegate.swift index 1e40e604..f9c7d1bb 100644 --- a/ScienceJournal/AppDelegate.swift +++ b/ScienceJournal/AppDelegate.swift @@ -15,7 +15,7 @@ */ import UIKit -import third_party_objective_c_material_components_ios_components_Snackbar_Snackbar +import MaterialComponents.MaterialSnackbar open class AppDelegate: UIResponder, UIApplicationDelegate { diff --git a/ScienceJournal/BLEArduino/BLEArduinoSensorInterface.swift b/ScienceJournal/BLEArduino/BLEArduinoSensorInterface.swift index f407df1b..3d727ef8 100644 --- a/ScienceJournal/BLEArduino/BLEArduinoSensorInterface.swift +++ b/ScienceJournal/BLEArduino/BLEArduinoSensorInterface.swift @@ -20,7 +20,7 @@ import UIKit import CoreBluetooth -import third_party_objective_c_material_components_ios_components_Dialogs_Dialogs +import MaterialComponents.MaterialDialogs import third_party_sciencejournal_ios_ScienceJournalProtos enum BLEArduinoSensorConfig: Int, Codable { diff --git a/ScienceJournal/BLEArduino/UI/ScienceKitSensorConfigViewController.swift b/ScienceJournal/BLEArduino/UI/ScienceKitSensorConfigViewController.swift index 54009d3b..3066c7c8 100644 --- a/ScienceJournal/BLEArduino/UI/ScienceKitSensorConfigViewController.swift +++ b/ScienceJournal/BLEArduino/UI/ScienceKitSensorConfigViewController.swift @@ -19,8 +19,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialTypography import third_party_sciencejournal_ios_ScienceJournalProtos class ScienceKitSensorConfigViewController: ScienceJournalViewController { diff --git a/ScienceJournal/BLEMakingScience/MakingScienceSensorConfigViewController.swift b/ScienceJournal/BLEMakingScience/MakingScienceSensorConfigViewController.swift index b93deab6..3ef4b283 100644 --- a/ScienceJournal/BLEMakingScience/MakingScienceSensorConfigViewController.swift +++ b/ScienceJournal/BLEMakingScience/MakingScienceSensorConfigViewController.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialTypography import third_party_sciencejournal_ios_ScienceJournalProtos /// A view controller that presents options to configure a Making Science BLE device. diff --git a/ScienceJournal/BLEMakingScience/MakingScienceSensorInterface.swift b/ScienceJournal/BLEMakingScience/MakingScienceSensorInterface.swift index ead92b09..1dc1a187 100644 --- a/ScienceJournal/BLEMakingScience/MakingScienceSensorInterface.swift +++ b/ScienceJournal/BLEMakingScience/MakingScienceSensorInterface.swift @@ -17,7 +17,7 @@ import CoreBluetooth import UIKit -import third_party_objective_c_material_components_ios_components_Dialogs_Dialogs +import MaterialComponents.MaterialDialogs import third_party_sciencejournal_ios_ScienceJournalProtos /// Interface for the Making Science Arduino sensor. diff --git a/ScienceJournal/Chart/ChartController.swift b/ScienceJournal/Chart/ChartController.swift index be2106d3..47fc019a 100644 --- a/ScienceJournal/Chart/ChartController.swift +++ b/ScienceJournal/Chart/ChartController.swift @@ -18,7 +18,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes extension UIScrollView { /// Returns true if user is touching scroll view, dragging or has released but the view is still diff --git a/ScienceJournal/Chart/ChartOptions.swift b/ScienceJournal/Chart/ChartOptions.swift index c4def2b2..c0fe2f52 100644 --- a/ScienceJournal/Chart/ChartOptions.swift +++ b/ScienceJournal/Chart/ChartOptions.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes /// ChartPlacementType represents the purpose of the chart which dictates style and behavior. /// diff --git a/ScienceJournal/Chart/ChartStatsOverlayView.swift b/ScienceJournal/Chart/ChartStatsOverlayView.swift index f6f20752..d7f05425 100644 --- a/ScienceJournal/Chart/ChartStatsOverlayView.swift +++ b/ScienceJournal/Chart/ChartStatsOverlayView.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes /// A view that displays dotted lines representing the minimum, maximum and average points /// relative to a chart view. diff --git a/ScienceJournal/Chart/ChartView.swift b/ScienceJournal/Chart/ChartView.swift index 0e48ff24..ac82f573 100644 --- a/ScienceJournal/Chart/ChartView.swift +++ b/ScienceJournal/Chart/ChartView.swift @@ -17,7 +17,7 @@ import QuartzCore import UIKit -import third_party_objective_c_material_components_ios_components_ActivityIndicator_ActivityIndicator +import MaterialComponents.MaterialActivityIndicator protocol ChartViewDelegate: class { func yPositionForLabel(atIndex labelIndex: Int) -> CGFloat? diff --git a/ScienceJournal/Chart/DataPointFlagView.swift b/ScienceJournal/Chart/DataPointFlagView.swift index 2795deba..608d3764 100644 --- a/ScienceJournal/Chart/DataPointFlagView.swift +++ b/ScienceJournal/Chart/DataPointFlagView.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography /// A view that displays a timestamp and a value in a rounded rect with a bottom arrow. class DataPointFlagView: UIView { diff --git a/ScienceJournal/Extensions/MDCAppBar+ScienceJournal.swift b/ScienceJournal/Extensions/MDCAppBar+ScienceJournal.swift index 5e26f35e..375dff65 100644 --- a/ScienceJournal/Extensions/MDCAppBar+ScienceJournal.swift +++ b/ScienceJournal/Extensions/MDCAppBar+ScienceJournal.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_AppBar_AppBar +import MaterialComponents.MaterialAppBar /// MDCAppBar extension for Science Journal, used by Material-style header view controllers. extension MDCAppBar { diff --git a/ScienceJournal/Extensions/MDCPalette+ScienceJournal.swift b/ScienceJournal/Extensions/MDCPalette+ScienceJournal.swift index 623be32d..f1454f51 100644 --- a/ScienceJournal/Extensions/MDCPalette+ScienceJournal.swift +++ b/ScienceJournal/Extensions/MDCPalette+ScienceJournal.swift @@ -16,7 +16,7 @@ import Foundation -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes extension MDCPalette { diff --git a/ScienceJournal/Extensions/MDCTabBar+ScienceJournal.swift b/ScienceJournal/Extensions/MDCTabBar+ScienceJournal.swift index da223c1e..8d443325 100644 --- a/ScienceJournal/Extensions/MDCTabBar+ScienceJournal.swift +++ b/ScienceJournal/Extensions/MDCTabBar+ScienceJournal.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Tabs_Tabs +import MaterialComponents.MaterialTabs extension MDCTabBar { diff --git a/ScienceJournal/Extensions/UIColor+ScienceJournal.swift b/ScienceJournal/Extensions/UIColor+ScienceJournal.swift index fecf0f00..dee430ee 100644 --- a/ScienceJournal/Extensions/UIColor+ScienceJournal.swift +++ b/ScienceJournal/Extensions/UIColor+ScienceJournal.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes /// UIColor extension for Science Journal with commonly-used static colors. extension UIColor { diff --git a/ScienceJournal/Launch/LaunchFailureViewController.swift b/ScienceJournal/Launch/LaunchFailureViewController.swift index f67e911f..f82c2b7f 100644 --- a/ScienceJournal/Launch/LaunchFailureViewController.swift +++ b/ScienceJournal/Launch/LaunchFailureViewController.swift @@ -15,8 +15,8 @@ */ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialTypography /// A view controller displayed to the user when launch operations encounter a permanent failure. class LaunchFailureViewController: UIViewController { diff --git a/ScienceJournal/Metadata/MetadataManager.swift b/ScienceJournal/Metadata/MetadataManager.swift index 8353ef91..fd4dd26d 100644 --- a/ScienceJournal/Metadata/MetadataManager.swift +++ b/ScienceJournal/Metadata/MetadataManager.swift @@ -20,7 +20,7 @@ import ImageIO import MobileCoreServices import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes import third_party_sciencejournal_ios_ScienceJournalProtos // MARK: - MetadataManagerError diff --git a/ScienceJournal/PDFExport/PDFExportOverlayViewController.swift b/ScienceJournal/PDFExport/PDFExportOverlayViewController.swift index 4626504d..89ccd0ca 100644 --- a/ScienceJournal/PDFExport/PDFExportOverlayViewController.swift +++ b/ScienceJournal/PDFExport/PDFExportOverlayViewController.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography protocol PDFExportOverlayViewControllerDelegate: class { /// The PDF export process should be canceled. diff --git a/ScienceJournal/SharableDocuments/FileTypeSelectionHandler.swift b/ScienceJournal/SharableDocuments/FileTypeSelectionHandler.swift index b4a4bebc..86bed841 100644 --- a/ScienceJournal/SharableDocuments/FileTypeSelectionHandler.swift +++ b/ScienceJournal/SharableDocuments/FileTypeSelectionHandler.swift @@ -15,7 +15,7 @@ */ import UIKit -import third_party_objective_c_material_components_ios_components_ActionSheet_ActionSheet +import MaterialComponents.MaterialActionSheet /// Handles file type selection in the process of exporting documents. class FileTypeSelectionHandler: NSObject { diff --git a/ScienceJournal/SharableDocuments/SaveToFilesHandler.swift b/ScienceJournal/SharableDocuments/SaveToFilesHandler.swift index 88c08139..8365335e 100644 --- a/ScienceJournal/SharableDocuments/SaveToFilesHandler.swift +++ b/ScienceJournal/SharableDocuments/SaveToFilesHandler.swift @@ -15,7 +15,7 @@ */ import UIKit -import third_party_objective_c_material_components_ios_components_Dialogs_Dialogs +import MaterialComponents.MaterialDialogs /// Handles saving experiments, trial data and images to the Files app. class SaveToFilesHandler: NSObject, UIDocumentPickerDelegate { diff --git a/ScienceJournal/UI/AboutViewController.swift b/ScienceJournal/UI/AboutViewController.swift index 1572d146..cb28411e 100644 --- a/ScienceJournal/UI/AboutViewController.swift +++ b/ScienceJournal/UI/AboutViewController.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Collections_Collections +import MaterialComponents.MaterialCollections /// A list of options to learn about the Science Journal app. class AboutViewController: MaterialHeaderCollectionViewController { diff --git a/ScienceJournal/UI/ActionBar.swift b/ScienceJournal/UI/ActionBar.swift index bfb025ee..0cebeee2 100644 --- a/ScienceJournal/UI/ActionBar.swift +++ b/ScienceJournal/UI/ActionBar.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons +import MaterialComponents.MaterialButtons /// A toolbar that has an action button. open class ActionBar: UIView { diff --git a/ScienceJournal/UI/AddExperimentsToDriveView.swift b/ScienceJournal/UI/AddExperimentsToDriveView.swift index b0f28b50..8f1299b5 100644 --- a/ScienceJournal/UI/AddExperimentsToDriveView.swift +++ b/ScienceJournal/UI/AddExperimentsToDriveView.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography /// A view shown above the claim experiments view, explaining that a user can add unclaimed /// experiments to Drive. diff --git a/ScienceJournal/UI/AddTrialNoteViewController.swift b/ScienceJournal/UI/AddTrialNoteViewController.swift index 3172aca0..d10c159e 100644 --- a/ScienceJournal/UI/AddTrialNoteViewController.swift +++ b/ScienceJournal/UI/AddTrialNoteViewController.swift @@ -17,8 +17,8 @@ import AVFoundation import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_TextFields_TextFields +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialTextFields class AddTrialNoteViewController: ScienceJournalViewController, UITextFieldDelegate { diff --git a/ScienceJournal/UI/AppFlowViewController.swift b/ScienceJournal/UI/AppFlowViewController.swift index 9f875f6e..d13938f4 100644 --- a/ScienceJournal/UI/AppFlowViewController.swift +++ b/ScienceJournal/UI/AppFlowViewController.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Dialogs_Dialogs +import MaterialComponents.MaterialDialogs /// The primary view controller for Science Journal which owns the navigation controller and manages /// all other flows and view controllers. diff --git a/ScienceJournal/UI/ArchiveFlagView.swift b/ScienceJournal/UI/ArchiveFlagView.swift index 40ea3e2c..9bc28b0d 100644 --- a/ScienceJournal/UI/ArchiveFlagView.swift +++ b/ScienceJournal/UI/ArchiveFlagView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_ShadowLayer_ShadowLayer -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialShadowLayer +import MaterialComponents.MaterialTypography /// A view that shows an archived flag, which can appear in an archived experiment list cell or /// trial card cell. diff --git a/ScienceJournal/UI/ArchivedFlagCell.swift b/ScienceJournal/UI/ArchivedFlagCell.swift index aef038cb..adbb54c4 100644 --- a/ScienceJournal/UI/ArchivedFlagCell.swift +++ b/ScienceJournal/UI/ArchivedFlagCell.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_ShadowLayer_ShadowLayer -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialShadowLayer +import MaterialComponents.MaterialTypography /// A cell that shows an archived flag, which can appear at the top of an archived experiment or /// trial, above that experiment or trial's data. diff --git a/ScienceJournal/UI/ButtonViewController.swift b/ScienceJournal/UI/ButtonViewController.swift index c1580454..e28458f1 100644 --- a/ScienceJournal/UI/ButtonViewController.swift +++ b/ScienceJournal/UI/ButtonViewController.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons +import MaterialComponents.MaterialButtons /// A view controller that displays a centered button. class ButtonViewController: UIViewController { diff --git a/ScienceJournal/UI/CameraActionBar.swift b/ScienceJournal/UI/CameraActionBar.swift index 0bb61e42..ece1c91c 100644 --- a/ScienceJournal/UI/CameraActionBar.swift +++ b/ScienceJournal/UI/CameraActionBar.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons +import MaterialComponents.MaterialButtons /// The action bar for the camera tab of the drawer. Contains a capture photo button. class CameraActionBar: UIView { diff --git a/ScienceJournal/UI/CameraViewController.swift b/ScienceJournal/UI/CameraViewController.swift index 82e4b150..66726621 100644 --- a/ScienceJournal/UI/CameraViewController.swift +++ b/ScienceJournal/UI/CameraViewController.swift @@ -17,7 +17,7 @@ import AVFoundation import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons +import MaterialComponents.MaterialButtons /// View subclass for the camera including a preview layer. class CameraView: UIView { diff --git a/ScienceJournal/UI/ChartExportViewController.swift b/ScienceJournal/UI/ChartExportViewController.swift index b3d17e77..85b998d1 100644 --- a/ScienceJournal/UI/ChartExportViewController.swift +++ b/ScienceJournal/UI/ChartExportViewController.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes /// Responsible for presentation of a chart in review mode. Derived from PlaybackViewController /// for the purposes of rendering a chart for PDF export from view hierarchy. diff --git a/ScienceJournal/UI/ClaimExperimentListCell.swift b/ScienceJournal/UI/ClaimExperimentListCell.swift index 3e4ca6f3..d63bf91f 100644 --- a/ScienceJournal/UI/ClaimExperimentListCell.swift +++ b/ScienceJournal/UI/ClaimExperimentListCell.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialPalettes protocol ClaimExperimentListCellDelegate: class { /// Tells the delegate the user tapped the add to Drive button for a cell. diff --git a/ScienceJournal/UI/ClaimExperimentsView.swift b/ScienceJournal/UI/ClaimExperimentsView.swift index 961177ee..a73e8fb4 100644 --- a/ScienceJournal/UI/ClaimExperimentsView.swift +++ b/ScienceJournal/UI/ClaimExperimentsView.swift @@ -16,9 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography protocol ClaimExperimentsViewDelegate: class { /// Tells the delegate the user pressed the claim experiments button. diff --git a/ScienceJournal/UI/ClaimExperimentsViewController.swift b/ScienceJournal/UI/ClaimExperimentsViewController.swift index 13de98a8..d4f56d12 100644 --- a/ScienceJournal/UI/ClaimExperimentsViewController.swift +++ b/ScienceJournal/UI/ClaimExperimentsViewController.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Dialogs_Dialogs +import MaterialComponents.MaterialDialogs protocol ClaimExperimentsViewControllerDelegate: class { diff --git a/ScienceJournal/UI/CropOverlayView.swift b/ScienceJournal/UI/CropOverlayView.swift index 30a74077..7d0950e8 100644 --- a/ScienceJournal/UI/CropOverlayView.swift +++ b/ScienceJournal/UI/CropOverlayView.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes /// A view that displays start and end crop positions for interactive chart cropping. class CropOverlayView: UIView { diff --git a/ScienceJournal/UI/CropOverlayViewController.swift b/ScienceJournal/UI/CropOverlayViewController.swift index 12a35df8..71794160 100644 --- a/ScienceJournal/UI/CropOverlayViewController.swift +++ b/ScienceJournal/UI/CropOverlayViewController.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes /// View controller that displays crop markers over the playback view. class CropOverlayViewController: UIViewController { diff --git a/ScienceJournal/UI/CropRangeViewController.swift b/ScienceJournal/UI/CropRangeViewController.swift index 98f7885f..f8d4e980 100644 --- a/ScienceJournal/UI/CropRangeViewController.swift +++ b/ScienceJournal/UI/CropRangeViewController.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Dialogs_Dialogs +import MaterialComponents.MaterialDialogs protocol CropRangeViewControllerDelegate: class { /// Informs delegate that a new timestamp was selected for one of the crop positions. diff --git a/ScienceJournal/UI/CurrentValueView.swift b/ScienceJournal/UI/CurrentValueView.swift index d8e41a3a..235574c5 100644 --- a/ScienceJournal/UI/CurrentValueView.swift +++ b/ScienceJournal/UI/CurrentValueView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialTypography /// Shows the current value of the sensor in a label, and an icon. class CurrentValueView: UIView { diff --git a/ScienceJournal/UI/DisabledInputView.swift b/ScienceJournal/UI/DisabledInputView.swift index a029695f..aa175165 100644 --- a/ScienceJournal/UI/DisabledInputView.swift +++ b/ScienceJournal/UI/DisabledInputView.swift @@ -16,9 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// A view used to overlay the camera or photo library picker when either is disabled for any /// reason. diff --git a/ScienceJournal/UI/DrawerView.swift b/ScienceJournal/UI/DrawerView.swift index 09c7c809..0b81b705 100644 --- a/ScienceJournal/UI/DrawerView.swift +++ b/ScienceJournal/UI/DrawerView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_ShadowLayer_ShadowLayer -import third_party_objective_c_material_components_ios_components_Tabs_Tabs +import MaterialComponents.MaterialShadowLayer +import MaterialComponents.MaterialTabs /// A protocol for the drawer view to update its delegate about selected items. public protocol DrawerViewDelegate: class { diff --git a/ScienceJournal/UI/EditExperimentPhotoView.swift b/ScienceJournal/UI/EditExperimentPhotoView.swift index a4bc91e8..ed536c95 100644 --- a/ScienceJournal/UI/EditExperimentPhotoView.swift +++ b/ScienceJournal/UI/EditExperimentPhotoView.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons +import MaterialComponents.MaterialButtons protocol EditExperimentPhotoViewDelegate: class { func choosePhotoButtonPressed() diff --git a/ScienceJournal/UI/EditExperimentViewController.swift b/ScienceJournal/UI/EditExperimentViewController.swift index d7db11bd..75bffbce 100644 --- a/ScienceJournal/UI/EditExperimentViewController.swift +++ b/ScienceJournal/UI/EditExperimentViewController.swift @@ -16,11 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Dialogs_Dialogs -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_TextFields_TextFields - -import third_party_objective_c_material_components_ios_components_private_KeyboardWatcher_KeyboardWatcher +import MaterialComponents.MaterialDialogs +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTextFields protocol EditExperimentViewControllerDelegate: class { /// Informs the delegate a new title was set. diff --git a/ScienceJournal/UI/EditTimestampView.swift b/ScienceJournal/UI/EditTimestampView.swift index 4f61234a..5164eeee 100644 --- a/ScienceJournal/UI/EditTimestampView.swift +++ b/ScienceJournal/UI/EditTimestampView.swift @@ -16,10 +16,10 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_TextFields_TextFields -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTextFields +import MaterialComponents.MaterialTypography /// View for the alert that allows a user to manually enter a timestamp. class EditTimestampView: UIView { diff --git a/ScienceJournal/UI/EditTimestampViewController.swift b/ScienceJournal/UI/EditTimestampViewController.swift index 43964978..9fb1812b 100644 --- a/ScienceJournal/UI/EditTimestampViewController.swift +++ b/ScienceJournal/UI/EditTimestampViewController.swift @@ -16,7 +16,7 @@ import Foundation -import third_party_objective_c_material_components_ios_components_TextFields_TextFields +import MaterialComponents.MaterialTextFields protocol EditTimestampViewControllerDelegate: class { /// Tells the delegate the user pressed the cancel button. diff --git a/ScienceJournal/UI/EmptyView.swift b/ScienceJournal/UI/EmptyView.swift index 94894677..d66ce13e 100644 --- a/ScienceJournal/UI/EmptyView.swift +++ b/ScienceJournal/UI/EmptyView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography protocol EmptyViewDelegate: class { /// Tells the delegate the user pressed the claim experiments button. diff --git a/ScienceJournal/UI/ErrorDialog.swift b/ScienceJournal/UI/ErrorDialog.swift index fcd8bf57..cb81d274 100644 --- a/ScienceJournal/UI/ErrorDialog.swift +++ b/ScienceJournal/UI/ErrorDialog.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography /// A view with a dark background and white text for showing an error message next to a text field. class ErrorDialog: UIView { diff --git a/ScienceJournal/UI/ExistingDataOptionsCell.swift b/ScienceJournal/UI/ExistingDataOptionsCell.swift index dc0ef10b..feec5b8d 100644 --- a/ScienceJournal/UI/ExistingDataOptionsCell.swift +++ b/ScienceJournal/UI/ExistingDataOptionsCell.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography /// The cell that shows each option for the existing data options screen. class ExistingDataOptionsCell: UICollectionViewCell { diff --git a/ScienceJournal/UI/ExistingDataOptionsHeaderView.swift b/ScienceJournal/UI/ExistingDataOptionsHeaderView.swift index 2fd207d0..9d99fa66 100644 --- a/ScienceJournal/UI/ExistingDataOptionsHeaderView.swift +++ b/ScienceJournal/UI/ExistingDataOptionsHeaderView.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography /// The header view for the existing data options screen, explaining that the user can now sync /// experiments. diff --git a/ScienceJournal/UI/ExistingDataOptionsViewController.swift b/ScienceJournal/UI/ExistingDataOptionsViewController.swift index 77a23a12..0680e4bf 100644 --- a/ScienceJournal/UI/ExistingDataOptionsViewController.swift +++ b/ScienceJournal/UI/ExistingDataOptionsViewController.swift @@ -16,9 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Collections_Collections -import third_party_objective_c_material_components_ios_components_Dialogs_Dialogs -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialCollections +import MaterialComponents.MaterialDialogs +import MaterialComponents.MaterialTypography protocol ExistingDataOptionsDelegate: class { /// Delegate method for selecting to save all experiments. diff --git a/ScienceJournal/UI/ExperimentCardCaptionView.swift b/ScienceJournal/UI/ExperimentCardCaptionView.swift index 0e61b690..4a8e8bfe 100644 --- a/ScienceJournal/UI/ExperimentCardCaptionView.swift +++ b/ScienceJournal/UI/ExperimentCardCaptionView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// The view containing a caption for an Experiment item, which is attached to the bottom of an /// ExperimentCell. Can appear on TrialCardCell, PhotoCardCell and SnapshotCardCell. NoteCardCells diff --git a/ScienceJournal/UI/ExperimentCardHeaderView.swift b/ScienceJournal/UI/ExperimentCardHeaderView.swift index f1ddd6cc..759d8970 100644 --- a/ScienceJournal/UI/ExperimentCardHeaderView.swift +++ b/ScienceJournal/UI/ExperimentCardHeaderView.swift @@ -16,9 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// The timestamp, caption and menu options view for all cells in an experiment or Trial Detail /// view. diff --git a/ScienceJournal/UI/ExperimentCardView.swift b/ScienceJournal/UI/ExperimentCardView.swift index 699b183a..4bc56564 100644 --- a/ScienceJournal/UI/ExperimentCardView.swift +++ b/ScienceJournal/UI/ExperimentCardView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// A UILabel subclass for the relative timestamp in an ExperimentCardView, which can have an /// optional shadow enabled. diff --git a/ScienceJournal/UI/ExperimentCoordinatorViewController.swift b/ScienceJournal/UI/ExperimentCoordinatorViewController.swift index 133ce9c9..123e7edf 100644 --- a/ScienceJournal/UI/ExperimentCoordinatorViewController.swift +++ b/ScienceJournal/UI/ExperimentCoordinatorViewController.swift @@ -18,11 +18,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Dialogs_Dialogs -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Snackbar_Snackbar - -import third_party_objective_c_material_components_ios_components_private_KeyboardWatcher_KeyboardWatcher +import MaterialComponents.MaterialDialogs +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialSnackbar protocol ExperimentCoordinatorViewControllerDelegate: class { diff --git a/ScienceJournal/UI/ExperimentDisplay.swift b/ScienceJournal/UI/ExperimentDisplay.swift index 34c783c5..cbb37267 100644 --- a/ScienceJournal/UI/ExperimentDisplay.swift +++ b/ScienceJournal/UI/ExperimentDisplay.swift @@ -15,7 +15,7 @@ */ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes /// Provides the configuration for views under this controller's tree for various states. enum ExperimentDisplay { diff --git a/ScienceJournal/UI/ExperimentItemsViewController.swift b/ScienceJournal/UI/ExperimentItemsViewController.swift index b11312a0..6acb9271 100644 --- a/ScienceJournal/UI/ExperimentItemsViewController.swift +++ b/ScienceJournal/UI/ExperimentItemsViewController.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography protocol ExperimentItemsViewControllerDelegate: class { func experimentItemsViewControllerDidSelectItem(_ displayItem: DisplayItem) diff --git a/ScienceJournal/UI/ExperimentsListCellBase.swift b/ScienceJournal/UI/ExperimentsListCellBase.swift index c31575b7..ac4ecc54 100644 --- a/ScienceJournal/UI/ExperimentsListCellBase.swift +++ b/ScienceJournal/UI/ExperimentsListCellBase.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography /// The base class for cells shown in experiments list, either an experiment that needs to be /// claimed, or an experiment that is being synced. It displays the experiment's photo and title. diff --git a/ScienceJournal/UI/ExperimentsListHeaderView.swift b/ScienceJournal/UI/ExperimentsListHeaderView.swift index 978df088..2aa27bad 100644 --- a/ScienceJournal/UI/ExperimentsListHeaderView.swift +++ b/ScienceJournal/UI/ExperimentsListHeaderView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// A header view for the Experiments list. The view contains a single label, whose text will /// contain the month name for a group of experiments (example: "May"). diff --git a/ScienceJournal/UI/ExperimentsListItemsViewController.swift b/ScienceJournal/UI/ExperimentsListItemsViewController.swift index ed14de37..caec79d9 100644 --- a/ScienceJournal/UI/ExperimentsListItemsViewController.swift +++ b/ScienceJournal/UI/ExperimentsListItemsViewController.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Collections_Collections -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialCollections +import MaterialComponents.MaterialPalettes protocol ExperimentsListItemsDelegate: class { /// Tells the delegate the user selected an experiment. diff --git a/ScienceJournal/UI/ExperimentsListViewController.swift b/ScienceJournal/UI/ExperimentsListViewController.swift index 25472a17..15d38b93 100644 --- a/ScienceJournal/UI/ExperimentsListViewController.swift +++ b/ScienceJournal/UI/ExperimentsListViewController.swift @@ -16,11 +16,11 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Dialogs_Dialogs -import third_party_objective_c_material_components_ios_components_FeatureHighlight_FeatureHighlight -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Snackbar_Snackbar +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialDialogs +import MaterialComponents.MaterialFeatureHighlight +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialSnackbar protocol ExperimentsListViewControllerDelegate: class { /// Informs the delegate the sidebar should be shown. diff --git a/ScienceJournal/UI/JumpToNowButton.swift b/ScienceJournal/UI/JumpToNowButton.swift index 3698cfea..53db036e 100644 --- a/ScienceJournal/UI/JumpToNowButton.swift +++ b/ScienceJournal/UI/JumpToNowButton.swift @@ -16,8 +16,8 @@ import Foundation -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialPalettes /// A floating jump-to-now button. class JumpToNowButton: MDCFloatingButton { diff --git a/ScienceJournal/UI/LearnMoreViewController.swift b/ScienceJournal/UI/LearnMoreViewController.swift index ef7af304..fa4ae237 100644 --- a/ScienceJournal/UI/LearnMoreViewController.swift +++ b/ScienceJournal/UI/LearnMoreViewController.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography /// A view controller that displays the "Learn More" content about a particular sensor. class LearnMoreViewController: MaterialHeaderViewController { diff --git a/ScienceJournal/UI/LicensesViewController.swift b/ScienceJournal/UI/LicensesViewController.swift index 288ae08f..2233b43e 100644 --- a/ScienceJournal/UI/LicensesViewController.swift +++ b/ScienceJournal/UI/LicensesViewController.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_CollectionCells_CollectionCells +import MaterialComponents.MaterialCollectionCells /// Data model for open source licenses. struct LicenseData { diff --git a/ScienceJournal/UI/MaterialBarButtonItem.swift b/ScienceJournal/UI/MaterialBarButtonItem.swift index 039081dc..a31f00cf 100644 --- a/ScienceJournal/UI/MaterialBarButtonItem.swift +++ b/ScienceJournal/UI/MaterialBarButtonItem.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons +import MaterialComponents.MaterialButtons /// A bar button item that can be used throughout Science Journal navigation bars. Can have popup /// menus attached to the `button` subview. diff --git a/ScienceJournal/UI/MaterialFloatingSpinner.swift b/ScienceJournal/UI/MaterialFloatingSpinner.swift index 87aac257..6b6ba968 100644 --- a/ScienceJournal/UI/MaterialFloatingSpinner.swift +++ b/ScienceJournal/UI/MaterialFloatingSpinner.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_ShadowLayer_ShadowLayer -import third_party_objective_c_material_components_ios_components_ActivityIndicator_ActivityIndicator +import MaterialComponents.MaterialShadowLayer +import MaterialComponents.MaterialActivityIndicator /// A circular spinner contained in a shadowed, circular view. Best placed on top of cells or views /// to indicate loading after user interaction. diff --git a/ScienceJournal/UI/MaterialHeaderCollectionViewController.swift b/ScienceJournal/UI/MaterialHeaderCollectionViewController.swift index 466b765f..9fdf4977 100644 --- a/ScienceJournal/UI/MaterialHeaderCollectionViewController.swift +++ b/ScienceJournal/UI/MaterialHeaderCollectionViewController.swift @@ -16,10 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_AppBar_AppBar -import third_party_objective_c_material_components_ios_components_Collections_Collections -import third_party_objective_c_material_components_ios_components_Dialogs_ColorThemer -import third_party_objective_c_material_components_ios_components_private_Overlay_Overlay +import MaterialComponents.MaterialAppBar +import MaterialComponents.MaterialCollections +import MaterialComponents.MaterialDialogs /// Boilerplate collection view controller for setting up a Material header view. class MaterialHeaderCollectionViewController: VisibilityTrackingCollectionViewController, diff --git a/ScienceJournal/UI/MaterialHeaderViewController.swift b/ScienceJournal/UI/MaterialHeaderViewController.swift index 1ca2a1f4..d8f2618a 100644 --- a/ScienceJournal/UI/MaterialHeaderViewController.swift +++ b/ScienceJournal/UI/MaterialHeaderViewController.swift @@ -16,9 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_AppBar_AppBar -import third_party_objective_c_material_components_ios_components_Dialogs_ColorThemer -import third_party_objective_c_material_components_ios_components_private_Overlay_Overlay +import MaterialComponents.MaterialAppBar +import MaterialComponents.MaterialDialogs /// Boilerplate view controller for setting up a Material header view. class MaterialHeaderViewController: ScienceJournalViewController, UIScrollViewDelegate, diff --git a/ScienceJournal/UI/MenuButton.swift b/ScienceJournal/UI/MenuButton.swift index 3d4c7ce6..aba13f1c 100644 --- a/ScienceJournal/UI/MenuButton.swift +++ b/ScienceJournal/UI/MenuButton.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons +import MaterialComponents.MaterialButtons /// An MDCFlatButton with horizontal dots used as a menu button throughout Science Journal. class MenuButton: MDCFlatButton { diff --git a/ScienceJournal/UI/NoteDetailEditCaptionCell.swift b/ScienceJournal/UI/NoteDetailEditCaptionCell.swift index 7d6e375b..73d8cefd 100644 --- a/ScienceJournal/UI/NoteDetailEditCaptionCell.swift +++ b/ScienceJournal/UI/NoteDetailEditCaptionCell.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_TextFields_TextFields +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialTextFields protocol NoteDetailEditCaptionCellDelegate: class { func didBeginEditingCaption() diff --git a/ScienceJournal/UI/NoteMetadataDetailCell.swift b/ScienceJournal/UI/NoteMetadataDetailCell.swift index f98fd0ed..4b3bbcaa 100644 --- a/ScienceJournal/UI/NoteMetadataDetailCell.swift +++ b/ScienceJournal/UI/NoteMetadataDetailCell.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// A cell that displays the description, value and icon for metadata about a note. class NoteMetadataDetailCell: UICollectionViewCell { diff --git a/ScienceJournal/UI/NoteMetadataDetailHeaderView.swift b/ScienceJournal/UI/NoteMetadataDetailHeaderView.swift index 8b0d3b3d..ee5c5219 100644 --- a/ScienceJournal/UI/NoteMetadataDetailHeaderView.swift +++ b/ScienceJournal/UI/NoteMetadataDetailHeaderView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// The header view that appears above metadata detail cells in note detail views. class NoteMetadataDetailHeaderView: UICollectionReusableView { diff --git a/ScienceJournal/UI/NotesView.swift b/ScienceJournal/UI/NotesView.swift index fcca2793..a9537f7c 100644 --- a/ScienceJournal/UI/NotesView.swift +++ b/ScienceJournal/UI/NotesView.swift @@ -16,9 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// View that lets a user take notes. class NotesView: UIView { diff --git a/ScienceJournal/UI/ObserveDataSource.swift b/ScienceJournal/UI/ObserveDataSource.swift index 9344fc2a..e08b24b0 100644 --- a/ScienceJournal/UI/ObserveDataSource.swift +++ b/ScienceJournal/UI/ObserveDataSource.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes protocol ObserveDataSourceDelegate: class { /// Tells the delegate a sensor's state changed. diff --git a/ScienceJournal/UI/ObserveFooterCell.swift b/ScienceJournal/UI/ObserveFooterCell.swift index 48724293..4356c961 100644 --- a/ScienceJournal/UI/ObserveFooterCell.swift +++ b/ScienceJournal/UI/ObserveFooterCell.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons +import MaterialComponents.MaterialButtons protocol ObserveFooterCellDelegate: class { func observeFooterAddButtonPressed() diff --git a/ScienceJournal/UI/ObserveViewController.swift b/ScienceJournal/UI/ObserveViewController.swift index e286ee61..2d396b7d 100644 --- a/ScienceJournal/UI/ObserveViewController.swift +++ b/ScienceJournal/UI/ObserveViewController.swift @@ -18,11 +18,10 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Collections_Collections -import third_party_objective_c_material_components_ios_components_Dialogs_Dialogs -import third_party_objective_c_material_components_ios_components_Dialogs_ColorThemer -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Snackbar_Snackbar +import MaterialComponents.MaterialCollections +import MaterialComponents.MaterialDialogs +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialSnackbar import third_party_sciencejournal_ios_ScienceJournalProtos protocol ObserveViewControllerDelegate: class { diff --git a/ScienceJournal/UI/OnboardingViewController.swift b/ScienceJournal/UI/OnboardingViewController.swift index e13fd247..42ef8a3d 100644 --- a/ScienceJournal/UI/OnboardingViewController.swift +++ b/ScienceJournal/UI/OnboardingViewController.swift @@ -16,9 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// The base class for onboarding view controllers that contains the Science Journal colors, /// iconography and layout. Permissions and welcome screens should subclass this to adhere to the diff --git a/ScienceJournal/UI/OptionSelectorView.swift b/ScienceJournal/UI/OptionSelectorView.swift index 0eb36eb4..94f61dd6 100644 --- a/ScienceJournal/UI/OptionSelectorView.swift +++ b/ScienceJournal/UI/OptionSelectorView.swift @@ -16,9 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography protocol OptionSelectorDelegate: class { /// Called when a pop up menu should be displayed with options. diff --git a/ScienceJournal/UI/PermissionsGuideViewController.swift b/ScienceJournal/UI/PermissionsGuideViewController.swift index 1be3403e..9c29b5c8 100644 --- a/ScienceJournal/UI/PermissionsGuideViewController.swift +++ b/ScienceJournal/UI/PermissionsGuideViewController.swift @@ -18,9 +18,9 @@ import AVFoundation import Photos import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography protocol PermissionsGuideDelegate: class { /// Informs the delegate the guide was completed and should be closed. diff --git a/ScienceJournal/UI/PhotoLibraryCell.swift b/ScienceJournal/UI/PhotoLibraryCell.swift index 0d52f2b3..6ea6fb55 100644 --- a/ScienceJournal/UI/PhotoLibraryCell.swift +++ b/ScienceJournal/UI/PhotoLibraryCell.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes protocol PhotoLibraryCellDelegate: class { /// Called when a photo is selected. diff --git a/ScienceJournal/UI/PhotoLibraryViewController.swift b/ScienceJournal/UI/PhotoLibraryViewController.swift index 7b81ff44..3b99f2f8 100644 --- a/ScienceJournal/UI/PhotoLibraryViewController.swift +++ b/ScienceJournal/UI/PhotoLibraryViewController.swift @@ -17,7 +17,7 @@ import Photos import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons +import MaterialComponents.MaterialButtons /// Subclass of the photo library view controller for analytics purposes and uses a check mark /// action bar button instead of a send icon. diff --git a/ScienceJournal/UI/PictureCardView.swift b/ScienceJournal/UI/PictureCardView.swift index b7ef8e8d..26297ac7 100644 --- a/ScienceJournal/UI/PictureCardView.swift +++ b/ScienceJournal/UI/PictureCardView.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes /// PictureCardView supports two different heights, depending on usage. In a Trial card, as a Trial /// Note, it uses `.small`. In a standalone picture cell, it uses `.large`. diff --git a/ScienceJournal/UI/PictureDetailViewController.swift b/ScienceJournal/UI/PictureDetailViewController.swift index cb79d8fe..4586fa6a 100644 --- a/ScienceJournal/UI/PictureDetailViewController.swift +++ b/ScienceJournal/UI/PictureDetailViewController.swift @@ -16,10 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_TextFields_TextFields - -import third_party_objective_c_material_components_ios_components_private_KeyboardWatcher_KeyboardWatcher +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialTextFields /// The detail view controller of a picture which shows the picture in a zooming, panning view and /// allows for caption editing. diff --git a/ScienceJournal/UI/PictureInfoViewController.swift b/ScienceJournal/UI/PictureInfoViewController.swift index 14296be3..c1ebbbc9 100644 --- a/ScienceJournal/UI/PictureInfoViewController.swift +++ b/ScienceJournal/UI/PictureInfoViewController.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Collections_Collections +import MaterialComponents.MaterialCollections /// A list of all the metadata for a picture note. class PictureInfoViewController: MaterialHeaderCollectionViewController { diff --git a/ScienceJournal/UI/PitchSensorAnimationView.swift b/ScienceJournal/UI/PitchSensorAnimationView.swift index 341053fe..7fd88b0f 100644 --- a/ScienceJournal/UI/PitchSensorAnimationView.swift +++ b/ScienceJournal/UI/PitchSensorAnimationView.swift @@ -17,7 +17,7 @@ import QuartzCore import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography fileprivate extension MDCTypography { diff --git a/ScienceJournal/UI/PlaybackOverlayView.swift b/ScienceJournal/UI/PlaybackOverlayView.swift index 8fe28217..a24874ae 100644 --- a/ScienceJournal/UI/PlaybackOverlayView.swift +++ b/ScienceJournal/UI/PlaybackOverlayView.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes /// An overlay view for ChartView that displays a flag and arrow that points to a point on a chart. class PlaybackOverlayView: UIView { diff --git a/ScienceJournal/UI/PlaybackViewController.swift b/ScienceJournal/UI/PlaybackViewController.swift index 70621a85..0c8d2593 100644 --- a/ScienceJournal/UI/PlaybackViewController.swift +++ b/ScienceJournal/UI/PlaybackViewController.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes protocol PlaybackViewControllerDelegate: class { /// Informs the delegate when playhead timestamp changes. diff --git a/ScienceJournal/UI/PopUpMenuAction+CommonActions.swift b/ScienceJournal/UI/PopUpMenuAction+CommonActions.swift index d164ed27..a2aef549 100644 --- a/ScienceJournal/UI/PopUpMenuAction+CommonActions.swift +++ b/ScienceJournal/UI/PopUpMenuAction+CommonActions.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Dialogs_Dialogs +import MaterialComponents.MaterialDialogs extension PopUpMenuAction { diff --git a/ScienceJournal/UI/PopUpMenuCell.swift b/ScienceJournal/UI/PopUpMenuCell.swift index 2812669b..88081788 100644 --- a/ScienceJournal/UI/PopUpMenuCell.swift +++ b/ScienceJournal/UI/PopUpMenuCell.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// A cell used to display an action in a pop up menu view controller. It has a text label and /// optional leading image view. diff --git a/ScienceJournal/UI/PopUpMenuViewController.swift b/ScienceJournal/UI/PopUpMenuViewController.swift index 974bf33f..21e1a947 100644 --- a/ScienceJournal/UI/PopUpMenuViewController.swift +++ b/ScienceJournal/UI/PopUpMenuViewController.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_ShadowLayer_ShadowLayer +import MaterialComponents.MaterialShadowLayer /// Displays and triggers actions in a collection view. Selecting a cell will call the handler and /// dismiss the view controller. diff --git a/ScienceJournal/UI/RecordButtonView.swift b/ScienceJournal/UI/RecordButtonView.swift index c1898c10..7c8e77eb 100644 --- a/ScienceJournal/UI/RecordButtonView.swift +++ b/ScienceJournal/UI/RecordButtonView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialTypography /// A button subclass for the record button to change accessibility labels when selected or not. class RecordButton: MDCFlatButton { diff --git a/ScienceJournal/UI/RecordingAnimatedView.swift b/ScienceJournal/UI/RecordingAnimatedView.swift index 94f5f27f..2354663b 100644 --- a/ScienceJournal/UI/RecordingAnimatedView.swift +++ b/ScienceJournal/UI/RecordingAnimatedView.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes /// A view containing an animated set of bars to denote a recording in progress, which is used in /// a TrialCardCell. diff --git a/ScienceJournal/UI/RenameViewController.swift b/ScienceJournal/UI/RenameViewController.swift index 745e8666..f97a31f5 100644 --- a/ScienceJournal/UI/RenameViewController.swift +++ b/ScienceJournal/UI/RenameViewController.swift @@ -16,9 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_TextFields_TextFields -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialTextFields +import MaterialComponents.MaterialTypography /// Rename view controller that has the title for naming an experiment. class RenameExperimentViewController: RenameViewController { diff --git a/ScienceJournal/UI/RotatingExpandButton.swift b/ScienceJournal/UI/RotatingExpandButton.swift index 8e94eac6..bedbbf66 100644 --- a/ScienceJournal/UI/RotatingExpandButton.swift +++ b/ScienceJournal/UI/RotatingExpandButton.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons +import MaterialComponents.MaterialButtons /// A button with an animating arrow, showing that content can be expanded. class RotatingExpandButton: MDCFlatButton { diff --git a/ScienceJournal/UI/ScienceJournalViewControllers.swift b/ScienceJournal/UI/ScienceJournalViewControllers.swift index 01b5218a..17d26cd6 100644 --- a/ScienceJournal/UI/ScienceJournalViewControllers.swift +++ b/ScienceJournal/UI/ScienceJournalViewControllers.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Collections_Collections +import MaterialComponents.MaterialCollections /// A wrapping class for MDCCollectionViewController, which will be extended to add analytics /// tracking. diff --git a/ScienceJournal/UI/SensorCard.swift b/ScienceJournal/UI/SensorCard.swift index 77597c93..4ddc0874 100644 --- a/ScienceJournal/UI/SensorCard.swift +++ b/ScienceJournal/UI/SensorCard.swift @@ -16,7 +16,7 @@ import Foundation -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes /// Represents a sensor card cell in the observe view. class SensorCard: NSObject { diff --git a/ScienceJournal/UI/SensorCardCell.swift b/ScienceJournal/UI/SensorCardCell.swift index f5a6cb36..3b08cced 100644 --- a/ScienceJournal/UI/SensorCardCell.swift +++ b/ScienceJournal/UI/SensorCardCell.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Tabs_Tabs +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTabs protocol SensorCardCellDelegate: class { /// Called when the sensor card expand button is pressed. diff --git a/ScienceJournal/UI/SensorCardHeaderView.swift b/ScienceJournal/UI/SensorCardHeaderView.swift index a8902056..d5e2c797 100644 --- a/ScienceJournal/UI/SensorCardHeaderView.swift +++ b/ScienceJournal/UI/SensorCardHeaderView.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography /// The header view for the sensor card cell. It contains a button to show/hide the sensor picker, a /// title, button to show the sensor description, and a button to show options. diff --git a/ScienceJournal/UI/SensorFailedView.swift b/ScienceJournal/UI/SensorFailedView.swift index e74e2a5b..d39b809e 100644 --- a/ScienceJournal/UI/SensorFailedView.swift +++ b/ScienceJournal/UI/SensorFailedView.swift @@ -16,9 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// A view that displays an activity indicator and a loading message. Used as a subview of /// a sensor card cell to indicate the sensor is loading. diff --git a/ScienceJournal/UI/SensorLoadingView.swift b/ScienceJournal/UI/SensorLoadingView.swift index d95866a6..ed6b8e7e 100644 --- a/ScienceJournal/UI/SensorLoadingView.swift +++ b/ScienceJournal/UI/SensorLoadingView.swift @@ -16,9 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography -import third_party_objective_c_material_components_ios_components_ActivityIndicator_ActivityIndicator +import MaterialComponents.MaterialActivityIndicator /// A view that displays an activity indicator and a loading message. Used as a subview of /// a sensor card cell to indicate the sensor is loading. diff --git a/ScienceJournal/UI/SensorPickerView.swift b/ScienceJournal/UI/SensorPickerView.swift index 7e434df6..cc8dad20 100644 --- a/ScienceJournal/UI/SensorPickerView.swift +++ b/ScienceJournal/UI/SensorPickerView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Tabs_Tabs +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialTabs /// A view with the sensor settings button and a picker view for selecting sensors. class SensorPickerView: UIView { diff --git a/ScienceJournal/UI/SensorSettingsCell.swift b/ScienceJournal/UI/SensorSettingsCell.swift index efeecc00..34bf0a6c 100644 --- a/ScienceJournal/UI/SensorSettingsCell.swift +++ b/ScienceJournal/UI/SensorSettingsCell.swift @@ -16,10 +16,10 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_CollectionCells_CollectionCells -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialCollectionCells +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography protocol SensorSettingsCellDelegate: class { /// Tells the delegate the button was pressed. diff --git a/ScienceJournal/UI/SensorSettingsDataSource.swift b/ScienceJournal/UI/SensorSettingsDataSource.swift index 40c4802d..03f9c320 100644 --- a/ScienceJournal/UI/SensorSettingsDataSource.swift +++ b/ScienceJournal/UI/SensorSettingsDataSource.swift @@ -17,7 +17,7 @@ import CoreBluetooth import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes protocol SensorSettingsDataSourceDelegate: class { /// Called when the data source has changed and collection view needs a refresh. diff --git a/ScienceJournal/UI/SensorSettingsViewController.swift b/ScienceJournal/UI/SensorSettingsViewController.swift index 65dc6865..a422b23d 100644 --- a/ScienceJournal/UI/SensorSettingsViewController.swift +++ b/ScienceJournal/UI/SensorSettingsViewController.swift @@ -17,8 +17,8 @@ import CoreBluetooth import UIKit -import third_party_objective_c_material_components_ios_components_Collections_Collections -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialCollections +import MaterialComponents.MaterialPalettes protocol SensorSettingsDelegate: class { /// Called when the sensor settings view controller changes enabled sensors. The delegate is diff --git a/ScienceJournal/UI/SensorStatType.swift b/ScienceJournal/UI/SensorStatType.swift index 7a592164..3391bf78 100644 --- a/ScienceJournal/UI/SensorStatType.swift +++ b/ScienceJournal/UI/SensorStatType.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes /// Enum for the different sensor stat types, to establish titles and colors. enum SensorStatType { diff --git a/ScienceJournal/UI/SeparatorView.swift b/ScienceJournal/UI/SeparatorView.swift index b0b1b2fe..1e68204b 100644 --- a/ScienceJournal/UI/SeparatorView.swift +++ b/ScienceJournal/UI/SeparatorView.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes /// A one point separator view that can be horizontal or vertical. The style determines its /// background color. diff --git a/ScienceJournal/UI/SettingsButtonCell.swift b/ScienceJournal/UI/SettingsButtonCell.swift index 36571117..399b081b 100644 --- a/ScienceJournal/UI/SettingsButtonCell.swift +++ b/ScienceJournal/UI/SettingsButtonCell.swift @@ -16,9 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// A settings cell with a title, description and button. class SettingsButtonCell: SettingsCell { diff --git a/ScienceJournal/UI/SettingsCell.swift b/ScienceJournal/UI/SettingsCell.swift index 8ac575c4..3fde5100 100644 --- a/ScienceJournal/UI/SettingsCell.swift +++ b/ScienceJournal/UI/SettingsCell.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography /// The base class which configures the title and description for a settings cell. This should be /// subclassed to create unique settings cell types. diff --git a/ScienceJournal/UI/SettingsSwitchCell.swift b/ScienceJournal/UI/SettingsSwitchCell.swift index a15f229a..1895b660 100644 --- a/ScienceJournal/UI/SettingsSwitchCell.swift +++ b/ScienceJournal/UI/SettingsSwitchCell.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography /// A settings cell with a title, description and switch. class SettingsSwitchCell: SettingsCell { diff --git a/ScienceJournal/UI/SettingsViewController.swift b/ScienceJournal/UI/SettingsViewController.swift index 6a57c70e..ee926f33 100644 --- a/ScienceJournal/UI/SettingsViewController.swift +++ b/ScienceJournal/UI/SettingsViewController.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Dialogs_Dialogs -import third_party_objective_c_material_components_ios_components_Snackbar_Snackbar +import MaterialComponents.MaterialDialogs +import MaterialComponents.MaterialSnackbar #if SCIENCEJOURNAL_DEV_BUILD || SCIENCEJOURNAL_DOGFOOD_BUILD public extension Notification.Name { diff --git a/ScienceJournal/UI/ShadowedView.swift b/ScienceJournal/UI/ShadowedView.swift index 67fe3a7f..ff7efac0 100644 --- a/ScienceJournal/UI/ShadowedView.swift +++ b/ScienceJournal/UI/ShadowedView.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_ShadowLayer_ShadowLayer +import MaterialComponents.MaterialShadowLayer /// A view that contains an MDC shadow layer. class ShadowedView: UIView { diff --git a/ScienceJournal/UI/SidebarAccountView.swift b/ScienceJournal/UI/SidebarAccountView.swift index 551c7dd5..50624b76 100644 --- a/ScienceJournal/UI/SidebarAccountView.swift +++ b/ScienceJournal/UI/SidebarAccountView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography protocol SidebarAccountViewDelegate: class { /// Informs the delegate the user tapped on the account view. diff --git a/ScienceJournal/UI/SidebarCell.swift b/ScienceJournal/UI/SidebarCell.swift index c552e091..410e13d9 100644 --- a/ScienceJournal/UI/SidebarCell.swift +++ b/ScienceJournal/UI/SidebarCell.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Ink_Ink -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialInk +import MaterialComponents.MaterialTypography /// Cell used in the sidebar to display a menu option with a title and icon. class SidebarCell: UICollectionViewCell { diff --git a/ScienceJournal/UI/SidebarHeaderCell.swift b/ScienceJournal/UI/SidebarHeaderCell.swift index 7660997e..fe0c156b 100644 --- a/ScienceJournal/UI/SidebarHeaderCell.swift +++ b/ScienceJournal/UI/SidebarHeaderCell.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_CollectionCells_CollectionCells +import MaterialComponents.MaterialCollectionCells /// A header cell for the sidebar menu that displays a static image. class SidebarHeaderCell: MDCCollectionViewCell { diff --git a/ScienceJournal/UI/SignInViewController.swift b/ScienceJournal/UI/SignInViewController.swift index 527896fc..664bbef3 100644 --- a/ScienceJournal/UI/SignInViewController.swift +++ b/ScienceJournal/UI/SignInViewController.swift @@ -16,9 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography protocol SignInViewControllerDelegate: class { /// Informs the delegate the user will continue without signing in. diff --git a/ScienceJournal/UI/Snackbars.swift b/ScienceJournal/UI/Snackbars.swift index cdd9f81a..18f0f355 100644 --- a/ScienceJournal/UI/Snackbars.swift +++ b/ScienceJournal/UI/Snackbars.swift @@ -16,8 +16,8 @@ import Foundation -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Snackbar_Snackbar +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialSnackbar /// Displays a snackbar with a button to undo an action. This is displayed for destructive actions /// to give the user a moment to undo that action. The undo block should encapsulate the diff --git a/ScienceJournal/UI/SnapshotCardView.swift b/ScienceJournal/UI/SnapshotCardView.swift index 0c8505b4..27a5e5e8 100644 --- a/ScienceJournal/UI/SnapshotCardView.swift +++ b/ScienceJournal/UI/SnapshotCardView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// A view composed of a snapshot's data, which includes a value, value description and an icon for /// the type of sensor used. This view can be used inside a trial card or inside a snapshot card, diff --git a/ScienceJournal/UI/SnapshotDetailViewController.swift b/ScienceJournal/UI/SnapshotDetailViewController.swift index 0d53caf3..84da7590 100644 --- a/ScienceJournal/UI/SnapshotDetailViewController.swift +++ b/ScienceJournal/UI/SnapshotDetailViewController.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Collections_Collections +import MaterialComponents.MaterialCollections /// The detail view controller of a snaphot which shows all the information, sensors and values from /// a snapshot note, and allows for caption editing. diff --git a/ScienceJournal/UI/StatView.swift b/ScienceJournal/UI/StatView.swift index c4b8b6d6..fd8eb394 100644 --- a/ScienceJournal/UI/StatView.swift +++ b/ScienceJournal/UI/StatView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// A view containing the value and header for a stat. Looks like: /// diff --git a/ScienceJournal/UI/TextNoteCardView.swift b/ScienceJournal/UI/TextNoteCardView.swift index b5ee9a20..716bb01c 100644 --- a/ScienceJournal/UI/TextNoteCardView.swift +++ b/ScienceJournal/UI/TextNoteCardView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// A subclass of UITextView that overrides point(inside:with:) to ensure taps do one of two things, /// depending on where in the view they occur: diff --git a/ScienceJournal/UI/TextNoteDetailViewController.swift b/ScienceJournal/UI/TextNoteDetailViewController.swift index fb085921..41eaf839 100644 --- a/ScienceJournal/UI/TextNoteDetailViewController.swift +++ b/ScienceJournal/UI/TextNoteDetailViewController.swift @@ -16,8 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography -import third_party_objective_c_material_components_ios_components_private_KeyboardWatcher_KeyboardWatcher +import MaterialComponents.MaterialTypography /// The detail view of a text note which allows for editing of the text contents. class TextNoteDetailViewController: MaterialHeaderViewController, NoteDetailController { diff --git a/ScienceJournal/UI/TimeSelectionView.swift b/ScienceJournal/UI/TimeSelectionView.swift index d8dc26a0..320ea0f1 100644 --- a/ScienceJournal/UI/TimeSelectionView.swift +++ b/ScienceJournal/UI/TimeSelectionView.swift @@ -16,9 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// A view that displays a timestamp and a confirm button. Used when editing a note's timestamp. class TimeSelectionView: ShadowedView { diff --git a/ScienceJournal/UI/TimerView.swift b/ScienceJournal/UI/TimerView.swift index 1d0e13cc..55f14e10 100644 --- a/ScienceJournal/UI/TimerView.swift +++ b/ScienceJournal/UI/TimerView.swift @@ -15,8 +15,8 @@ */ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialTypography +import MaterialComponents.MaterialPalettes /// The timer view is a capsule containing the current recording timer. /// It is meant to be used in a bar button item. diff --git a/ScienceJournal/UI/TrialCardHeaderView.swift b/ScienceJournal/UI/TrialCardHeaderView.swift index f8fcfce3..6d16a497 100644 --- a/ScienceJournal/UI/TrialCardHeaderView.swift +++ b/ScienceJournal/UI/TrialCardHeaderView.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography /// The header view for a trial, which contains the trial's title and a background color. class TrialCardHeaderView: UIView { diff --git a/ScienceJournal/UI/TrialCardMoreNotesView.swift b/ScienceJournal/UI/TrialCardMoreNotesView.swift index 167d1712..d9ac07e3 100644 --- a/ScienceJournal/UI/TrialCardMoreNotesView.swift +++ b/ScienceJournal/UI/TrialCardMoreNotesView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// A view that shows a more notes label, used in a trial card cell when there are more than two /// notes for a trial. diff --git a/ScienceJournal/UI/TrialCardSensorView.swift b/ScienceJournal/UI/TrialCardSensorView.swift index deb08461..7b0ec85a 100644 --- a/ScienceJournal/UI/TrialCardSensorView.swift +++ b/ScienceJournal/UI/TrialCardSensorView.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography /// A view composed of a sensor recording from a trial, which includes the title of the sensor, /// min/average/max values across the recording, the icon for the sensor used, and a chart view diff --git a/ScienceJournal/UI/TrialDetailAddNoteCell.swift b/ScienceJournal/UI/TrialDetailAddNoteCell.swift index cc079ef2..09d37fb3 100644 --- a/ScienceJournal/UI/TrialDetailAddNoteCell.swift +++ b/ScienceJournal/UI/TrialDetailAddNoteCell.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialTypography protocol TrialDetailAddNoteCellDelegate: class { /// Informs the delegate that the add note button was pressed. diff --git a/ScienceJournal/UI/TrialDetailHeaderCell.swift b/ScienceJournal/UI/TrialDetailHeaderCell.swift index 4272d3a3..18961393 100644 --- a/ScienceJournal/UI/TrialDetailHeaderCell.swift +++ b/ScienceJournal/UI/TrialDetailHeaderCell.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// The cell describing a trial, used above the pinned sensor info in TrialDetailViewController. /// This cell contains a title, timestamp and duration. diff --git a/ScienceJournal/UI/TrialDetailSensorsView.swift b/ScienceJournal/UI/TrialDetailSensorsView.swift index cb1f57c4..6e1fdf1f 100644 --- a/ScienceJournal/UI/TrialDetailSensorsView.swift +++ b/ScienceJournal/UI/TrialDetailSensorsView.swift @@ -16,9 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography protocol TrialDetailSensorsViewDelegate: class { /// Informs the delegate a sensor view will be shown, most likely because the user tapped a diff --git a/ScienceJournal/UI/TrialDetailViewController.swift b/ScienceJournal/UI/TrialDetailViewController.swift index e4d1724e..038c1c64 100644 --- a/ScienceJournal/UI/TrialDetailViewController.swift +++ b/ScienceJournal/UI/TrialDetailViewController.swift @@ -18,12 +18,10 @@ import UIKit -import third_party_objective_c_material_components_ios_components_BottomSheet_BottomSheet -import third_party_objective_c_material_components_ios_components_Dialogs_Dialogs -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Snackbar_Snackbar - -import third_party_objective_c_material_components_ios_components_private_KeyboardWatcher_KeyboardWatcher +import MaterialComponents.MaterialBottomSheet +import MaterialComponents.MaterialDialogs +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialSnackbar protocol TrialDetailViewControllerDelegate: class { /// Informs the delegate a note should be shown. diff --git a/ScienceJournal/UI/TrialShareSettingsViewController.swift b/ScienceJournal/UI/TrialShareSettingsViewController.swift index 3e817615..ef910940 100644 --- a/ScienceJournal/UI/TrialShareSettingsViewController.swift +++ b/ScienceJournal/UI/TrialShareSettingsViewController.swift @@ -16,9 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_ProgressView_ProgressView -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialProgressView +import MaterialComponents.MaterialTypography /// A view controller for managing trial share settings. class TrialShareSettingsViewController: ScienceJournalViewController { diff --git a/ScienceJournal/UI/TriggerCardView.swift b/ScienceJournal/UI/TriggerCardView.swift index fd46f07a..627815ff 100644 --- a/ScienceJournal/UI/TriggerCardView.swift +++ b/ScienceJournal/UI/TriggerCardView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// A view composed of a trigger's data, which includes a value, value description and an icon for /// the type of sensor used. This view can be used inside a trial card or inside a trigger card, diff --git a/ScienceJournal/UI/TriggerDetailViewController.swift b/ScienceJournal/UI/TriggerDetailViewController.swift index ed9c50ec..2a3810da 100644 --- a/ScienceJournal/UI/TriggerDetailViewController.swift +++ b/ScienceJournal/UI/TriggerDetailViewController.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Collections_Collections +import MaterialComponents.MaterialCollections /// The detail view controller of a trigger which shows a trigger note, metadata, and allows for /// caption editing. diff --git a/ScienceJournal/UI/TriggerEditSectionHeaderView.swift b/ScienceJournal/UI/TriggerEditSectionHeaderView.swift index 5c22e7a0..b55805d9 100644 --- a/ScienceJournal/UI/TriggerEditSectionHeaderView.swift +++ b/ScienceJournal/UI/TriggerEditSectionHeaderView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// The header view for a section in the trigger edit view. It has a single label. class TriggerEditSectionHeaderView: UIView { diff --git a/ScienceJournal/UI/TriggerListCell.swift b/ScienceJournal/UI/TriggerListCell.swift index 10855cc7..d6c92780 100644 --- a/ScienceJournal/UI/TriggerListCell.swift +++ b/ScienceJournal/UI/TriggerListCell.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_CollectionCells_CollectionCells -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialCollectionCells +import MaterialComponents.MaterialTypography protocol TriggerListCellDelegate: class { /// Called when the switch value changes. diff --git a/ScienceJournal/UI/TriggerListViewController.swift b/ScienceJournal/UI/TriggerListViewController.swift index cccaf588..278c9e23 100644 --- a/ScienceJournal/UI/TriggerListViewController.swift +++ b/ScienceJournal/UI/TriggerListViewController.swift @@ -16,10 +16,10 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Collections_Collections -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialCollections +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography protocol TriggerListDelegate: class { /// Called when the trigger list view controller updates triggers. diff --git a/ScienceJournal/UI/TriggerOptionEntryView.swift b/ScienceJournal/UI/TriggerOptionEntryView.swift index 3f7dac38..455b30da 100644 --- a/ScienceJournal/UI/TriggerOptionEntryView.swift +++ b/ScienceJournal/UI/TriggerOptionEntryView.swift @@ -16,9 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_TextFields_TextFields -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTextFields +import MaterialComponents.MaterialTypography /// A view for typing a trigger attribute, in the trigger edit view. class TriggerOptionEntryView: UIView { diff --git a/ScienceJournal/UI/TriggerOptionSwitchView.swift b/ScienceJournal/UI/TriggerOptionSwitchView.swift index 994005f8..85ed3f15 100644 --- a/ScienceJournal/UI/TriggerOptionSwitchView.swift +++ b/ScienceJournal/UI/TriggerOptionSwitchView.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography /// A view for switching a trigger attribute, in the trigger edit view. class TriggerOptionSwitchView: UIView { diff --git a/ScienceJournal/UI/TriggerTypeSelectorView.swift b/ScienceJournal/UI/TriggerTypeSelectorView.swift index fc2d2d1a..584282b4 100644 --- a/ScienceJournal/UI/TriggerTypeSelectorView.swift +++ b/ScienceJournal/UI/TriggerTypeSelectorView.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialTypography import third_party_sciencejournal_ios_ScienceJournalProtos protocol TriggerTypeSelectorDelegate: class { diff --git a/ScienceJournal/UI/TriggerValueEntryView.swift b/ScienceJournal/UI/TriggerValueEntryView.swift index b3059479..d5b27d77 100644 --- a/ScienceJournal/UI/TriggerValueEntryView.swift +++ b/ScienceJournal/UI/TriggerValueEntryView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// A view for typing a trigger value, in the trigger edit view. class TriggerValueEntryView: TriggerOptionEntryView { diff --git a/ScienceJournal/UI/UIViewController+MaterialHeader.swift b/ScienceJournal/UI/UIViewController+MaterialHeader.swift index 3d42fb88..3df867f6 100644 --- a/ScienceJournal/UI/UIViewController+MaterialHeader.swift +++ b/ScienceJournal/UI/UIViewController+MaterialHeader.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_AppBar_AppBar +import MaterialComponents.MaterialAppBar @objc protocol MaterialHeader { var hasMaterialHeader: Bool { get } diff --git a/ScienceJournal/UI/UserFlowViewController.swift b/ScienceJournal/UI/UserFlowViewController.swift index 4cfd1286..6794dbfc 100644 --- a/ScienceJournal/UI/UserFlowViewController.swift +++ b/ScienceJournal/UI/UserFlowViewController.swift @@ -18,8 +18,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Dialogs_Dialogs -import third_party_objective_c_material_components_ios_components_Dialogs_ColorThemer +import MaterialComponents.MaterialDialogs protocol UserFlowViewControllerDelegate: class { /// Tells the delegate to present the account selector so a user can change or remove accounts. diff --git a/ScienceJournal/UI/ViewConstants.swift b/ScienceJournal/UI/ViewConstants.swift index fdd310cc..86ef790b 100644 --- a/ScienceJournal/UI/ViewConstants.swift +++ b/ScienceJournal/UI/ViewConstants.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Dialogs_ColorThemer -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialDialogs +import MaterialComponents.MaterialPalettes /// Shared view constants for Science Journal. struct ViewConstants { diff --git a/ScienceJournal/UI/VisibilityTrackingViewControllers.swift b/ScienceJournal/UI/VisibilityTrackingViewControllers.swift index f12e85d8..6084f6c4 100644 --- a/ScienceJournal/UI/VisibilityTrackingViewControllers.swift +++ b/ScienceJournal/UI/VisibilityTrackingViewControllers.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Collections_Collections +import MaterialComponents.MaterialCollections /// A view controller that tracks the visibility of its view. open class VisibilityTrackingViewController: UIViewController { diff --git a/ScienceJournal/UI/VisualTriggerView+TriggerFiredView.swift b/ScienceJournal/UI/VisualTriggerView+TriggerFiredView.swift index 4660070e..55800d3d 100644 --- a/ScienceJournal/UI/VisualTriggerView+TriggerFiredView.swift +++ b/ScienceJournal/UI/VisualTriggerView+TriggerFiredView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography extension VisualTriggerView { diff --git a/ScienceJournal/UI/VisualTriggerView.swift b/ScienceJournal/UI/VisualTriggerView.swift index b55fa925..5b777442 100644 --- a/ScienceJournal/UI/VisualTriggerView.swift +++ b/ScienceJournal/UI/VisualTriggerView.swift @@ -16,8 +16,8 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography /// The view for the sensor card cell that displays visual triggers. class VisualTriggerView: UIView { diff --git a/ScienceJournal/UI/WelcomeViewController.swift b/ScienceJournal/UI/WelcomeViewController.swift index a196b713..e5209867 100644 --- a/ScienceJournal/UI/WelcomeViewController.swift +++ b/ScienceJournal/UI/WelcomeViewController.swift @@ -16,9 +16,9 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Buttons_Buttons -import third_party_objective_c_material_components_ios_components_Palettes_Palettes -import third_party_objective_c_material_components_ios_components_Typography_Typography +import MaterialComponents.MaterialButtons +import MaterialComponents.MaterialPalettes +import MaterialComponents.MaterialTypography protocol WelcomeViewControllerDelegate: class { /// Informs the delegate the user tapped the get started button. diff --git a/ScienceJournal/ViewData/DisplayTrialViewData.swift b/ScienceJournal/ViewData/DisplayTrialViewData.swift index 2556b05c..2dcfafbb 100644 --- a/ScienceJournal/ViewData/DisplayTrialViewData.swift +++ b/ScienceJournal/ViewData/DisplayTrialViewData.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes enum DisplayTrialStatus { case recording diff --git a/ScienceJournal/WrappedModels/ExperimentOverview.swift b/ScienceJournal/WrappedModels/ExperimentOverview.swift index 6b59db85..4eb2517c 100644 --- a/ScienceJournal/WrappedModels/ExperimentOverview.swift +++ b/ScienceJournal/WrappedModels/ExperimentOverview.swift @@ -16,7 +16,7 @@ import Foundation -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes import third_party_sciencejournal_ios_ScienceJournalProtos /// A wrapper for GSJExperimentOverview. Describes the details of an experiment needed to list diff --git a/ScienceJournal/WrappedModels/SensorLayout.swift b/ScienceJournal/WrappedModels/SensorLayout.swift index 35714ef1..25242917 100644 --- a/ScienceJournal/WrappedModels/SensorLayout.swift +++ b/ScienceJournal/WrappedModels/SensorLayout.swift @@ -16,7 +16,7 @@ import UIKit -import third_party_objective_c_material_components_ios_components_Palettes_Palettes +import MaterialComponents.MaterialPalettes import third_party_sciencejournal_ios_ScienceJournalProtos /// A wrapper for GSJSensorLayout. Represents the visual appearance of a sensor chart. diff --git a/ScienceJournalTests/Chart/ChartControllerTest.swift b/ScienceJournalTests/Chart/ChartControllerTest.swift index eac44646..19c026ff 100644 --- a/ScienceJournalTests/Chart/ChartControllerTest.swift +++ b/ScienceJournalTests/Chart/ChartControllerTest.swift @@ -16,7 +16,7 @@ import XCTest -@testable import third_party_objective_c_material_components_ios_components_Palettes_Palettes +@testable import MaterialComponents.MaterialPalettes @testable import third_party_sciencejournal_ios_ScienceJournalOpen class ChartControllerTest: XCTestCase, ChartControllerDelegate { diff --git a/ScienceJournalTests/Extensions/MDCPalette+ScienceJournalTest.swift b/ScienceJournalTests/Extensions/MDCPalette+ScienceJournalTest.swift index 90fb0bbb..a28b5fec 100644 --- a/ScienceJournalTests/Extensions/MDCPalette+ScienceJournalTest.swift +++ b/ScienceJournalTests/Extensions/MDCPalette+ScienceJournalTest.swift @@ -16,7 +16,7 @@ import XCTest -@testable import third_party_objective_c_material_components_ios_components_Palettes_Palettes +@testable import MaterialComponents.MaterialPalettes @testable import third_party_sciencejournal_ios_ScienceJournalOpen class MDCPalette_ScienceJournalTest: XCTestCase { diff --git a/ScienceJournalTests/Metadata/MetadataManagerTest.swift b/ScienceJournalTests/Metadata/MetadataManagerTest.swift index 06617137..68402b33 100644 --- a/ScienceJournalTests/Metadata/MetadataManagerTest.swift +++ b/ScienceJournalTests/Metadata/MetadataManagerTest.swift @@ -16,7 +16,7 @@ import XCTest -@testable import third_party_objective_c_material_components_ios_components_Palettes_Palettes +@testable import MaterialComponents.MaterialPalettes @testable import third_party_sciencejournal_ios_ScienceJournalOpen @testable import third_party_sciencejournal_ios_ScienceJournalProtos diff --git a/ScienceJournalTests/SensorData/Export/ExportExperimentSensorDataOperationTest.swift b/ScienceJournalTests/SensorData/Export/ExportExperimentSensorDataOperationTest.swift index a8688072..cd895200 100644 --- a/ScienceJournalTests/SensorData/Export/ExportExperimentSensorDataOperationTest.swift +++ b/ScienceJournalTests/SensorData/Export/ExportExperimentSensorDataOperationTest.swift @@ -16,7 +16,7 @@ import XCTest -@testable import third_party_objective_c_material_components_ios_components_Palettes_Palettes +@testable import MaterialComponents.MaterialPalettes @testable import third_party_sciencejournal_ios_ScienceJournalOpen @testable import third_party_sciencejournal_ios_ScienceJournalProtos diff --git a/ScienceJournalTests/UI/NoteDetailControllerTest.swift b/ScienceJournalTests/UI/NoteDetailControllerTest.swift index 2bdd191b..9dd5c63f 100644 --- a/ScienceJournalTests/UI/NoteDetailControllerTest.swift +++ b/ScienceJournalTests/UI/NoteDetailControllerTest.swift @@ -18,7 +18,7 @@ import XCTest @testable import third_party_sciencejournal_ios_ScienceJournalOpen -import third_party_objective_c_material_components_ios_components_TextFields_TextFields +import MaterialComponents.MaterialTextFields class NoteDetailControllerTest: XCTestCase { diff --git a/ScienceJournalTests/WrappedModels/SensorLayoutTest.swift b/ScienceJournalTests/WrappedModels/SensorLayoutTest.swift index 3ac0bda1..1d2406b8 100644 --- a/ScienceJournalTests/WrappedModels/SensorLayoutTest.swift +++ b/ScienceJournalTests/WrappedModels/SensorLayoutTest.swift @@ -16,7 +16,7 @@ import XCTest -@testable import third_party_objective_c_material_components_ios_components_Palettes_Palettes +@testable import MaterialComponents.MaterialPalettes @testable import third_party_sciencejournal_ios_ScienceJournalOpen @testable import third_party_sciencejournal_ios_ScienceJournalProtos From 2cc6ab92266af66998c29fc88f48540da389546a Mon Sep 17 00:00:00 2001 From: Emilio Pavia Date: Mon, 12 Oct 2020 08:51:15 +0200 Subject: [PATCH 5/5] Bump build number --- ScienceJournal.xcodeproj/project.pbxproj | 8 ++++---- ScienceJournal/Info.plist | 2 +- ScienceJournalTests/Info.plist | 2 +- ScienceJournalUITests/Info.plist | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ScienceJournal.xcodeproj/project.pbxproj b/ScienceJournal.xcodeproj/project.pbxproj index 8b0874ae..122a7efe 100644 --- a/ScienceJournal.xcodeproj/project.pbxproj +++ b/ScienceJournal.xcodeproj/project.pbxproj @@ -4270,7 +4270,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = logo_science_journal; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 20; + CURRENT_PROJECT_VERSION = 22; DEVELOPMENT_TEAM = 7KT7ZWMCJT; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -4438,7 +4438,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = logo_science_journal; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 20; + CURRENT_PROJECT_VERSION = 22; DEVELOPMENT_TEAM = 7KT7ZWMCJT; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -4684,7 +4684,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = logo_science_journal; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 20; + CURRENT_PROJECT_VERSION = 22; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 7KT7ZWMCJT; FRAMEWORK_SEARCH_PATHS = ( @@ -4762,7 +4762,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = logo_science_journal; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 20; + CURRENT_PROJECT_VERSION = 22; DEVELOPMENT_TEAM = 7KT7ZWMCJT; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", diff --git a/ScienceJournal/Info.plist b/ScienceJournal/Info.plist index 2ba52876..2a5b1cb0 100644 --- a/ScienceJournal/Info.plist +++ b/ScienceJournal/Info.plist @@ -41,7 +41,7 @@ CFBundleShortVersionString 4.1.0 CFBundleVersion - 20 + 22 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ScienceJournalTests/Info.plist b/ScienceJournalTests/Info.plist index eef597c5..f1545f50 100644 --- a/ScienceJournalTests/Info.plist +++ b/ScienceJournalTests/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 4.1.0 CFBundleVersion - 20 + 22 diff --git a/ScienceJournalUITests/Info.plist b/ScienceJournalUITests/Info.plist index eef597c5..f1545f50 100644 --- a/ScienceJournalUITests/Info.plist +++ b/ScienceJournalUITests/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 4.1.0 CFBundleVersion - 20 + 22