Skip to content

Commit

Permalink
Merge pull request #99 from robbdimitrov/fixes/update
Browse files Browse the repository at this point in the history
Fixes/update
  • Loading branch information
robbdimitrov committed Oct 5, 2019
2 parents 8fabf57 + c7b7818 commit 074c205
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Example/Classes/Controllers/RDVDetailsViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ @implementation RDVDetailsViewController
- (void)viewDidLoad {
[super viewDidLoad];

self.title = @"Details";
self.title = NSLocalizedString(@"Details", nil);
self.view.backgroundColor = [UIColor colorWithRed:250/255.0 green:250/255.0 blue:250/255.0 alpha:1.0];

UILabel *label = [[UILabel alloc] init];
label.text = @"Detail View Controller";
label.text = NSLocalizedString(@"Detail View Controller", nil);
label.frame = CGRectMake(20, 150, CGRectGetWidth(self.view.frame) - 2 * 20, 20);
label.autoresizingMask = UIViewAutoresizingFlexibleWidth;
label.textAlignment = NSTextAlignmentCenter;
Expand Down
2 changes: 1 addition & 1 deletion Example/Classes/Controllers/RDVFirstViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ @implementation RDVFirstViewController
- (instancetype)init {
self = [super init];
if (self) {
self.title = @"First";
self.title = NSLocalizedString(@"First", nil);
}
return self;
}
Expand Down
2 changes: 1 addition & 1 deletion Example/Classes/Controllers/RDVSecondViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ @implementation RDVSecondViewController
- (instancetype)init {
self = [super init];
if (self) {
self.title = @"Second";
self.title = NSLocalizedString(@"Second", nil);
}
return self;
}
Expand Down
2 changes: 1 addition & 1 deletion Example/Classes/Controllers/RDVThirdViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ @implementation RDVThirdViewController
- (instancetype)init {
self = [super init];
if (self) {
self.title = @"Third";
self.title = NSLocalizedString(@"Third", nil);
}
return self;
}
Expand Down
4 changes: 2 additions & 2 deletions RDVTabBarController.podspec
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Pod::Spec.new do |s|
s.name = "RDVTabBarController"
s.version = "1.2.0"
s.version = "1.3.0"
s.summary = "Highly customizable tabBar and tabBarController for iOS"
s.description = "RDVTabBarController is iPad and iPhone compatible. Supports landscape and portrait orientations and can be used inside UINavigationController."
s.homepage = "https://github.com/robbdimitrov/RDVTabBarController"
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { "Robert Dimitrov" => "robert_dimitrov@me.com" }
s.platform = :ios, '8.0'
s.source = { :git => "https://github.com/robbdimitrov/RDVTabBarController.git", :tag => "v1.2.0" }
s.source = { :git => "https://github.com/robbdimitrov/RDVTabBarController.git", :tag => "v1.3.0" }
s.source_files = 'RDVTabBarController', 'RDVTabBarController/**/*.{h,m}'
s.framework = 'UIKit', 'CoreGraphics', 'Foundation'
s.requires_arc = true
Expand Down
20 changes: 18 additions & 2 deletions RDVTabBarController.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -290,15 +290,21 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = RDV;
LastUpgradeCheck = 1000;
LastUpgradeCheck = 1100;
ORGANIZATIONNAME = "Robert Dimitrov";
TargetAttributes = {
B4616BAA17228DF700863892 = {
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = B4616BA617228DF700863892 /* Build configuration list for PBXProject "RDVTabBarController" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = B4616BA217228DF700863892;
productRefGroup = B4616BAC17228DF700863892 /* Products */;
Expand Down Expand Up @@ -387,6 +393,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
Expand Down Expand Up @@ -437,6 +444,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
Expand Down Expand Up @@ -479,25 +487,33 @@
B4616BC917228DF700863892 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Example/RDVTabBarController-Prefix.pch";
INFOPLIST_FILE = "$(SRCROOT)/Example/RDVTabBarController-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.robbdimitrov.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
WRAPPER_EXTENSION = app;
};
name = Debug;
};
B4616BCA17228DF700863892 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Example/RDVTabBarController-Prefix.pch";
INFOPLIST_FILE = "$(SRCROOT)/Example/RDVTabBarController-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.robbdimitrov.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
WRAPPER_EXTENSION = app;
};
name = Release;
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ tabBar.backgroundView.backgroundColor = [UIColor colorWithRed:245/255.0
## Requirements
* ARC
* iOS 5.0 or later
* Xcode 5
* iOS 8.0 or later
* Xcode 11
## Contact
Expand Down

0 comments on commit 074c205

Please sign in to comment.