![ColorThemer] Reorganize source to create separate targets for each …

…color themer. (#1466) * reorganize the color themer classes so that they are separate targets for each mutator. * moved source files out of MaterialThemes. * moved theme examples into their main component locations out of themer’s. * renamed core subspec to 'Component'
material-components · May 26, 2017 · 1c7ca93 · 1c7ca93
1 parent 3a57189
commit 1c7ca93
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 23 deletions.
diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec
@@ -138,24 +138,40 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "Dialogs" do |ss|
-    ss.ios.deployment_target = '8.0'
-    ss.public_header_files = "components/#{ss.base_name}/src/*.h"
-    ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
-
-    ss.dependency "MaterialComponents/Buttons"
-    ss.dependency "MaterialComponents/ShadowElevations"
-    ss.dependency "MaterialComponents/ShadowLayer"
-    ss.dependency "MaterialComponents/private/KeyboardWatcher"
-    ss.dependency "MaterialComponents/private/RTL"
+    ss.subspec "Component" do |sss|
+      sss.ios.deployment_target = '8.0'
+      sss.public_header_files = "components/#{ss.base_name}/src/*.h"
+      sss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
+
+      sss.dependency "MaterialComponents/Buttons"
+      sss.dependency "MaterialComponents/ShadowElevations"
+      sss.dependency "MaterialComponents/ShadowLayer"
+      sss.dependency "MaterialComponents/private/KeyboardWatcher"
+      sss.dependency "MaterialComponents/private/RTL"
+    end
+    ss.subspec "ColorThemer" do |sss|
+      sss.ios.deployment_target = '8.0'
+      sss.public_header_files = "components/#{ss.base_name}/src/#{sss.base_name}/*.h"
+      sss.source_files = "components/#{ss.base_name}/src/#{sss.base_name}/*.{h,m}", "components/#{ss.base_name}/src/#{sss.base_name}/private/*.{h,m}"
+      sss.dependency "MaterialComponents/Themes"
+    end
   end
 
   s.subspec "FeatureHighlight" do |ss|
-    ss.ios.deployment_target = '8.0'
-    ss.public_header_files = "components/#{ss.base_name}/src/*.h"
-    ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
-    ss.resources = ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle"]
-    ss.dependency "MaterialComponents/Typography"
-    ss.dependency "MDFTextAccessibility"
+    ss.subspec "Component" do |sss|
+      sss.ios.deployment_target = '8.0'
+      sss.public_header_files = "components/#{ss.base_name}/src/*.h"
+      sss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
+      sss.resources = ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle"]
+      sss.dependency "MaterialComponents/Typography"
+      sss.dependency "MDFTextAccessibility"
+    end
+    ss.subspec "ColorThemer" do |sss|
+      sss.ios.deployment_target = '8.0'
+      sss.public_header_files = "components/#{ss.base_name}/src/#{sss.base_name}/*.h"
+      sss.source_files = "components/#{ss.base_name}/src/#{sss.base_name}/*.{h,m}", "components/#{ss.base_name}/src/#{sss.base_name}/private/*.{h,m}"
+      sss.dependency "MaterialComponents/Themes"
+    end
   end
 
   s.subspec "FlexibleHeader" do |ss|
@@ -273,9 +289,6 @@ Pod::Spec.new do |s|
     ss.ios.deployment_target = '8.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
-
-    ss.dependency "MaterialComponents/FeatureHighlight"
-    ss.dependency "MaterialComponents/Dialogs"
   end
 
   s.subspec "Typography" do |ss|

diff --git a/...lertColorThemerTypicalUseViewController.m → ...lertColorThemerTypicalUseViewController.m b/...lertColorThemerTypicalUseViewController.m → ...lertColorThemerTypicalUseViewController.m
@@ -20,6 +20,7 @@
 #import "MaterialDialogs.h"
 #import "MaterialThemes.h"
 #import "MaterialPalettes.h"
+#import "MDCAlertColorThemer.h"
 
 @implementation AlertColorThemerTypicalUseViewController
 

diff --git a/...pplemental/AlertColorThemerSupplemental.h → ...pplemental/AlertColorThemerSupplemental.h b/...pplemental/AlertColorThemerSupplemental.h → ...pplemental/AlertColorThemerSupplemental.h
diff --git a/...pplemental/AlertColorThemerSupplemental.m → ...pplemental/AlertColorThemerSupplemental.m b/...pplemental/AlertColorThemerSupplemental.m → ...pplemental/AlertColorThemerSupplemental.m
@@ -55,7 +55,7 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView
 @implementation AlertColorThemerTypicalUseViewController (CatalogByConvention)
 
 + (NSArray *)catalogBreadcrumbs {
-  return @[ @"Themes", @"Theme Alert Dialog" ];
+  return @[ @"Dialogs", @"Theme Alert Dialog" ];
 }
 
 + (NSString *)catalogDescription {

diff --git a/components/Themes/src/MDCAlertColorThemer.h → ...ogs/src/ColorThemer/MDCAlertColorThemer.h b/components/Themes/src/MDCAlertColorThemer.h → ...ogs/src/ColorThemer/MDCAlertColorThemer.h
diff --git a/components/Themes/src/MDCAlertColorThemer.m → ...ogs/src/ColorThemer/MDCAlertColorThemer.m b/components/Themes/src/MDCAlertColorThemer.m → ...ogs/src/ColorThemer/MDCAlertColorThemer.m
diff --git a/...ightColorThemerTypicalUseViewController.m → ...ightColorThemerTypicalUseViewController.m b/...ightColorThemerTypicalUseViewController.m → ...ightColorThemerTypicalUseViewController.m
@@ -19,6 +19,7 @@
 #import "MaterialFeatureHighlight.h"
 #import "MaterialThemes.h"
 #import "MaterialPalettes.h"
+#import "MDCFeatureHighlightColorThemer.h"
 
 static NSString *const kTitleText = @"Themed Feature Highlight";
 static NSString *const kBodyText =

diff --git a/...FeatureHighlightColorThemerSupplemental.h → ...FeatureHighlightColorThemerSupplemental.h b/...FeatureHighlightColorThemerSupplemental.h → ...FeatureHighlightColorThemerSupplemental.h
diff --git a/...FeatureHighlightColorThemerSupplemental.m → ...FeatureHighlightColorThemerSupplemental.m b/...FeatureHighlightColorThemerSupplemental.m → ...FeatureHighlightColorThemerSupplemental.m
@@ -69,7 +69,7 @@ - (void)viewDidLayoutSubviews {
 }
 
 + (NSArray *)catalogBreadcrumbs {
-  return @[ @"Themes", @"Theme Feature Highlight" ];
+  return @[ @"Feature Highlight", @"Theme Feature Highlight" ];
 }
 
 + (NSString *)catalogDescription {

diff --git a/...emes/src/MDCFeatureHighlightColorThemer.h → ...orThemer/MDCFeatureHighlightColorThemer.h b/...emes/src/MDCFeatureHighlightColorThemer.h → ...orThemer/MDCFeatureHighlightColorThemer.h
diff --git a/...emes/src/MDCFeatureHighlightColorThemer.m → ...orThemer/MDCFeatureHighlightColorThemer.m b/...emes/src/MDCFeatureHighlightColorThemer.m → ...orThemer/MDCFeatureHighlightColorThemer.m
diff --git a/components/Themes/src/MaterialThemes.h b/components/Themes/src/MaterialThemes.h
@@ -15,6 +15,3 @@
  */
 
 #import "MDCColorScheme.h"
-
-#import "MDCAlertColorThemer.h"
-#import "MDCFeatureHighlightColorThemer.h"