Standardize segmented control color and update snapshots

openedx-unsupported · Apr 7, 2016 · a34a802 · a34a802
1 parent 2b65a63
commit a34a802
Show file tree

Hide file tree

Showing 19 changed files with 1 addition and 12 deletions.
diff --git a/Source/JSONFormBuilder.swift b/Source/JSONFormBuilder.swift
@@ -64,12 +64,6 @@ class JSONFormBuilder {
 
             titleLabel.textAlignment = .Natural
 
-            let selectedAttributes = OEXTextStyle(weight: .Normal, size: .Small, color: OEXStyles.sharedStyles().neutralBlackT())
-            let unselectedAttributes = OEXTextStyle(weight: .Normal, size: .Small, color: OEXStyles.sharedStyles().neutralDark())
-            typeControl.setTitleTextAttributes(selectedAttributes.attributes, forState: .Selected)
-            typeControl.setTitleTextAttributes(unselectedAttributes.attributes, forState: .Normal)
-            typeControl.tintColor = OEXStyles.sharedStyles().primaryXLightColor()
-
             descriptionLabel.textAlignment = .Natural
             descriptionLabel.numberOfLines = 0
             descriptionLabel.preferredMaxLayoutWidth = 200 //value doesn't seem to matter as long as it's small enough

diff --git a/Source/OEXStyles+Swift.swift b/Source/OEXStyles+Swift.swift
@@ -37,7 +37,7 @@ extension OEXStyles {
         let styleAttributes = OEXTextStyle(weight: .Normal, size : .Small, color : self.neutralBlack()).attributes
         UISegmentedControl.appearance().setTitleTextAttributes(styleAttributes, forState: UIControlState.Selected)
         UISegmentedControl.appearance().setTitleTextAttributes(styleAttributes, forState: UIControlState.Normal)
-        UISegmentedControl.appearance().tintColor = self.neutralLight()
+        UISegmentedControl.appearance().tintColor = self.primaryXLightColor()
 
         UINavigationBar.appearance().translucent = false
 

diff --git a/Source/TabContainerView.swift b/Source/TabContainerView.swift
@@ -39,11 +39,6 @@ class TabContainerView : UIView {
             make.bottom.equalTo(self.snp_bottomMargin)
         }
 
-        let selectedAttributes = OEXTextStyle(weight: .Normal, size: .Small, color: OEXStyles.sharedStyles().neutralBlackT())
-        let unselectedAttributes = OEXTextStyle(weight: .Normal, size: .Small, color: OEXStyles.sharedStyles().neutralDark())
-        control.setTitleTextAttributes(selectedAttributes.attributes, forState: .Selected)
-        control.setTitleTextAttributes(unselectedAttributes.attributes, forState: .Normal)
-        control.tintColor = OEXStyles.sharedStyles().primaryXLightColor()
         control.oex_addAction({[weak self] control in
             let index = (control as! UISegmentedControl).selectedSegmentIndex
             self?.showTabAtIndex(index)

diff --git a/...DiscussionNewCommentViewControllerTests/testContentResponse_ios8_380x568@2x.png b/...DiscussionNewCommentViewControllerTests/testContentResponse_ios8_380x568@2x.png
diff --git a/...ussionNewCommentViewControllerTests/testContentResponse_ios8_rtl_380x568@2x.png b/...ussionNewCommentViewControllerTests/testContentResponse_ios8_rtl_380x568@2x.png
diff --git a/...DiscussionNewCommentViewControllerTests/testContentResponse_ios9_380x568@2x.png b/...DiscussionNewCommentViewControllerTests/testContentResponse_ios9_380x568@2x.png
diff --git a/...ussionNewCommentViewControllerTests/testContentResponse_ios9_rtl_380x568@2x.png b/...ussionNewCommentViewControllerTests/testContentResponse_ios9_rtl_380x568@2x.png
diff --git a/...Tests.UserProfileEditViewControllerTests/testSnapshotPublic_ios8_380x568@2x.png b/...Tests.UserProfileEditViewControllerTests/testSnapshotPublic_ios8_380x568@2x.png
diff --git a/...s.UserProfileEditViewControllerTests/testSnapshotPublic_ios8_rtl_380x568@2x.png b/...s.UserProfileEditViewControllerTests/testSnapshotPublic_ios8_rtl_380x568@2x.png
diff --git a/...Tests.UserProfileEditViewControllerTests/testSnapshotPublic_ios9_380x568@2x.png b/...Tests.UserProfileEditViewControllerTests/testSnapshotPublic_ios9_380x568@2x.png
diff --git a/...s.UserProfileEditViewControllerTests/testSnapshotPublic_ios9_rtl_380x568@2x.png b/...s.UserProfileEditViewControllerTests/testSnapshotPublic_ios9_rtl_380x568@2x.png
diff --git a/...ests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios8_380x568@2x.png b/...ests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios8_380x568@2x.png
diff --git a/....UserProfileViewTests/testSnapshotContentPrivateProfile_ios8_rtl_380x568@2x.png b/....UserProfileViewTests/testSnapshotContentPrivateProfile_ios8_rtl_380x568@2x.png
diff --git a/...ests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios9_380x568@2x.png b/...ests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios9_380x568@2x.png
diff --git a/....UserProfileViewTests/testSnapshotContentPrivateProfile_ios9_rtl_380x568@2x.png b/....UserProfileViewTests/testSnapshotContentPrivateProfile_ios9_rtl_380x568@2x.png
diff --git a/...Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios8_380x568@2x.png b/...Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios8_380x568@2x.png
diff --git a/...shots/edXTests.UserProfileViewTests/testSnapshotContent_ios8_rtl_380x568@2x.png b/...shots/edXTests.UserProfileViewTests/testSnapshotContent_ios8_rtl_380x568@2x.png
diff --git a/...Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios9_380x568@2x.png b/...Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios9_380x568@2x.png
diff --git a/...shots/edXTests.UserProfileViewTests/testSnapshotContent_ios9_rtl_380x568@2x.png b/...shots/edXTests.UserProfileViewTests/testSnapshotContent_ios9_rtl_380x568@2x.png