added example .h and .m files
diff --git a/MaterialComponentsFontDiskLoader.podspec b/MaterialComponentsFontDiskLoader.podspec
index dae9175..bd21aad 100644
--- a/MaterialComponentsFontDiskLoader.podspec
+++ b/MaterialComponentsFontDiskLoader.podspec
@@ -16,7 +16,7 @@
end
s.subspec "examples" do |ss|
- ss.source_files = "examples/*.{swift}", "examples/supplemental/*.{swift}"
+ ss.source_files = "examples/*.{swift,m,h}", "examples/supplemental/*.{swift,m,h}"
ss.exclude_files = "examples/TableOfContents.swift"
ss.resources = "examples/supplemental/*.{xcassets}"
ss.dependency "MaterialComponentsFontDiskLoader/lib"
diff --git a/Podfile.lock b/Podfile.lock
index 6dd6436..4e2efc7 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -17,7 +17,7 @@
SPEC CHECKSUMS:
CatalogByConvention: be55c2263132e4f9f59299ac8a528ee8715b3275
- MaterialComponentsFontDiskLoader: f2d2d836115531b073f98669a887bdd183b87afe
+ MaterialComponentsFontDiskLoader: e278c675a781249b36fc0db401178fa5525d0fe4
PODFILE CHECKSUM: 649627e6ec178f12839ad4263c7173050ff14135
diff --git a/examples/FontDiskLoaderSimipleExample.m b/examples/FontDiskLoaderSimipleExample.m
index 32842df..b6601f6 100644
--- a/examples/FontDiskLoaderSimipleExample.m
+++ b/examples/FontDiskLoaderSimipleExample.m
@@ -17,10 +17,10 @@
#import <UIKit/UIKit.h>
#import "MaterialFontDiskLoader.h"
-#import "MaterialRobotoFontLoader.h"
-// TODO(iangordon): Re-add 'private/' to the path below once our Podspec specfically defines our
-// header search paths instead of flattening our header files into a single directory.
-#import "MDCRoboto+Constants.h"
+
+NSString *const MDCRobotoBundle = @"MaterialRobotoFontLoader.bundle";
+NSString *const MDCRobotoRegularFontName = @"Roboto-Regular";
+NSString *const MDCRobotoRegularFontFilename = @"Roboto-Regular.ttf";
@interface FontDiskLoaderSimpleExample : UIViewController
@end
@@ -43,7 +43,7 @@
// Consider using the named styles provided by the Typography component instead of specific font
// sizes. See https://github.com/material-components/material-components-ios/tree/develop/components/Typography
- NSBundle *bundle = [NSBundle bundleForClass:[MDCRobotoFontLoader class]];
+ NSBundle *bundle = [NSBundle bundleForClass:[self class]];
MDCFontDiskLoader *fontDiskLoader =
[[MDCFontDiskLoader alloc] initWithFontName:MDCRobotoRegularFontName
filename:MDCRobotoRegularFontFilename
diff --git a/examples/apps/Catalog/Catalog.xcodeproj/project.pbxproj b/examples/apps/Catalog/Catalog.xcodeproj/project.pbxproj
index b18f95c..501a945 100644
--- a/examples/apps/Catalog/Catalog.xcodeproj/project.pbxproj
+++ b/examples/apps/Catalog/Catalog.xcodeproj/project.pbxproj
@@ -12,6 +12,8 @@
666FAA841D384A6B000363DA /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 666FAA831D384A6B000363DA /* AppDelegate.swift */; };
666FAA8B1D384A6B000363DA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 666FAA8A1D384A6B000363DA /* Assets.xcassets */; };
666FAA8E1D384A6B000363DA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 666FAA8C1D384A6B000363DA /* LaunchScreen.storyboard */; };
+ 82D585569F097666CC3C3887 /* Pods_Catalog.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A04F8F93D4BF9ED8E0D0988 /* Pods_Catalog.framework */; };
+ AA9CCC6805245E038B5FCC89 /* Pods_UnitTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EF460028A1981471F5A474D /* Pods_UnitTests.framework */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -25,6 +27,10 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
+ 0AC9073AA4180B55C9384FBB /* Pods-UnitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-UnitTests.debug.xcconfig"; path = "../../../Pods/Target Support Files/Pods-UnitTests/Pods-UnitTests.debug.xcconfig"; sourceTree = "<group>"; };
+ 1B0227391F65036C3BB374CF /* Pods-Catalog.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Catalog.debug.xcconfig"; path = "../../../Pods/Target Support Files/Pods-Catalog/Pods-Catalog.debug.xcconfig"; sourceTree = "<group>"; };
+ 33F9E696F504FBFB9F7DE0ED /* Pods-Catalog.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Catalog.release.xcconfig"; path = "../../../Pods/Target Support Files/Pods-Catalog/Pods-Catalog.release.xcconfig"; sourceTree = "<group>"; };
+ 3A04F8F93D4BF9ED8E0D0988 /* Pods_Catalog.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Catalog.framework; sourceTree = BUILT_PRODUCTS_DIR; };
666FAA801D384A6B000363DA /* Catalog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Catalog.app; sourceTree = BUILT_PRODUCTS_DIR; };
666FAA831D384A6B000363DA /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = Catalog/AppDelegate.swift; sourceTree = "<group>"; };
666FAA8A1D384A6B000363DA /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -33,10 +39,12 @@
666FAA941D384A6B000363DA /* UnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
666FAA9A1D384A6B000363DA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = ../UnitTests/Info.plist; sourceTree = "<group>"; };
666FAAA71D384D51000363DA /* UnitTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "UnitTests-Bridging-Header.h"; path = "../UnitTests/UnitTests-Bridging-Header.h"; sourceTree = "<group>"; };
+ 6EF460028A1981471F5A474D /* Pods_UnitTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_UnitTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7C877424F2E692E73737CF02 /* Pods_MaterialComponentsFontDiskLoader_Catalog.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MaterialComponentsFontDiskLoader_Catalog.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8AC8FDFECE8C418E29AEF618 /* Pods-MaterialComponentsFontDiskLoader-UnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MaterialComponentsFontDiskLoader-UnitTests.release.xcconfig"; path = "../../../Pods/Target Support Files/Pods-MaterialComponentsFontDiskLoader-UnitTests/Pods-MaterialComponentsFontDiskLoader-UnitTests.release.xcconfig"; sourceTree = "<group>"; };
96A8F56D5CB79434BBCE9F71 /* Pods-MaterialComponentsFontDiskLoader-Catalog.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MaterialComponentsFontDiskLoader-Catalog.release.xcconfig"; path = "../../../Pods/Target Support Files/Pods-MaterialComponentsFontDiskLoader-Catalog/Pods-MaterialComponentsFontDiskLoader-Catalog.release.xcconfig"; sourceTree = "<group>"; };
AB4AB464A4B7B32191B0413C /* Pods_MaterialComponentsFontDiskLoader_UnitTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MaterialComponentsFontDiskLoader_UnitTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ BA7CF73A7799CC463B33A8BE /* Pods-UnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-UnitTests.release.xcconfig"; path = "../../../Pods/Target Support Files/Pods-UnitTests/Pods-UnitTests.release.xcconfig"; sourceTree = "<group>"; };
E73DA7C25E0E350F37313DC7 /* Pods-MaterialComponentsFontDiskLoader-UnitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MaterialComponentsFontDiskLoader-UnitTests.debug.xcconfig"; path = "../../../Pods/Target Support Files/Pods-MaterialComponentsFontDiskLoader-UnitTests/Pods-MaterialComponentsFontDiskLoader-UnitTests.debug.xcconfig"; sourceTree = "<group>"; };
FF7DAF436A8FED9ECAEF6ECC /* Pods-MaterialComponentsFontDiskLoader-Catalog.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MaterialComponentsFontDiskLoader-Catalog.debug.xcconfig"; path = "../../../Pods/Target Support Files/Pods-MaterialComponentsFontDiskLoader-Catalog/Pods-MaterialComponentsFontDiskLoader-Catalog.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -47,6 +55,7 @@
buildActionMask = 2147483647;
files = (
1FBCF3DF51B13ECAB98CDEE6 /* Pods_MaterialComponentsFontDiskLoader_UnitTests.framework in Frameworks */,
+ AA9CCC6805245E038B5FCC89 /* Pods_UnitTests.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -55,6 +64,7 @@
buildActionMask = 2147483647;
files = (
0076F5EDE8B748A9A2B743C1 /* Pods_MaterialComponentsFontDiskLoader_Catalog.framework in Frameworks */,
+ 82D585569F097666CC3C3887 /* Pods_Catalog.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -143,6 +153,10 @@
96A8F56D5CB79434BBCE9F71 /* Pods-MaterialComponentsFontDiskLoader-Catalog.release.xcconfig */,
E73DA7C25E0E350F37313DC7 /* Pods-MaterialComponentsFontDiskLoader-UnitTests.debug.xcconfig */,
8AC8FDFECE8C418E29AEF618 /* Pods-MaterialComponentsFontDiskLoader-UnitTests.release.xcconfig */,
+ 1B0227391F65036C3BB374CF /* Pods-Catalog.debug.xcconfig */,
+ 33F9E696F504FBFB9F7DE0ED /* Pods-Catalog.release.xcconfig */,
+ 0AC9073AA4180B55C9384FBB /* Pods-UnitTests.debug.xcconfig */,
+ BA7CF73A7799CC463B33A8BE /* Pods-UnitTests.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
@@ -152,6 +166,8 @@
children = (
7C877424F2E692E73737CF02 /* Pods_MaterialComponentsFontDiskLoader_Catalog.framework */,
AB4AB464A4B7B32191B0413C /* Pods_MaterialComponentsFontDiskLoader_UnitTests.framework */,
+ 3A04F8F93D4BF9ED8E0D0988 /* Pods_Catalog.framework */,
+ 6EF460028A1981471F5A474D /* Pods_UnitTests.framework */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -272,7 +288,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/../../../Pods/Target Support Files/Pods-MaterialComponentsFontDiskLoader-UnitTests/Pods-MaterialComponentsFontDiskLoader-UnitTests-frameworks.sh\"\n";
+ shellScript = "\"${SRCROOT}/../../../Pods/Target Support Files/Pods-UnitTests/Pods-UnitTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
537015044D19F7D130FD650F /* [CP] Check Pods Manifest.lock */ = {
@@ -302,7 +318,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/../../../Pods/Target Support Files/Pods-MaterialComponentsFontDiskLoader-Catalog/Pods-MaterialComponentsFontDiskLoader-Catalog-frameworks.sh\"\n";
+ shellScript = "\"${SRCROOT}/../../../Pods/Target Support Files/Pods-Catalog/Pods-Catalog-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
B027C979F1138D1320778D9D /* [CP] Check Pods Manifest.lock */ = {
@@ -332,7 +348,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/../../../Pods/Target Support Files/Pods-MaterialComponentsFontDiskLoader-Catalog/Pods-MaterialComponentsFontDiskLoader-Catalog-resources.sh\"\n";
+ shellScript = "\"${SRCROOT}/../../../Pods/Target Support Files/Pods-Catalog/Pods-Catalog-resources.sh\"\n";
showEnvVarsInLog = 0;
};
F163D178B43514EF9E45AF7E /* [CP] Copy Pods Resources */ = {
@@ -347,7 +363,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/../../../Pods/Target Support Files/Pods-MaterialComponentsFontDiskLoader-UnitTests/Pods-MaterialComponentsFontDiskLoader-UnitTests-resources.sh\"\n";
+ shellScript = "\"${SRCROOT}/../../../Pods/Target Support Files/Pods-UnitTests/Pods-UnitTests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -477,7 +493,7 @@
};
666FAA9E1D384A6B000363DA /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = FF7DAF436A8FED9ECAEF6ECC /* Pods-MaterialComponentsFontDiskLoader-Catalog.debug.xcconfig */;
+ baseConfigurationReference = 1B0227391F65036C3BB374CF /* Pods-Catalog.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = Catalog/Info.plist;
@@ -490,7 +506,7 @@
};
666FAA9F1D384A6B000363DA /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 96A8F56D5CB79434BBCE9F71 /* Pods-MaterialComponentsFontDiskLoader-Catalog.release.xcconfig */;
+ baseConfigurationReference = 33F9E696F504FBFB9F7DE0ED /* Pods-Catalog.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = Catalog/Info.plist;
@@ -504,7 +520,7 @@
};
666FAAA11D384A6B000363DA /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = E73DA7C25E0E350F37313DC7 /* Pods-MaterialComponentsFontDiskLoader-UnitTests.debug.xcconfig */;
+ baseConfigurationReference = 0AC9073AA4180B55C9384FBB /* Pods-UnitTests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_ENABLE_MODULES = YES;
@@ -521,7 +537,7 @@
};
666FAAA21D384A6B000363DA /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 8AC8FDFECE8C418E29AEF618 /* Pods-MaterialComponentsFontDiskLoader-UnitTests.release.xcconfig */;
+ baseConfigurationReference = BA7CF73A7799CC463B33A8BE /* Pods-UnitTests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_ENABLE_MODULES = YES;
