Skip to content

Added flag parameter in delegate didSelectCountryWithName method #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xtrinch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added flag parameter in delegate didSelectCountryWithName method #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CountryPicker/CountryPicker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

@protocol CountryPickerDelegate <UIPickerViewDelegate>

- (void)countryPicker:(CountryPicker *)picker didSelectCountryWithName:(NSString *)name code:(NSString *)code;
- (void)countryPicker:(CountryPicker *)picker didSelectCountryWithName:(NSString *)name code:(NSString *)code flag:(UIImage *)flag;

@end

Expand All @@ -76,5 +76,5 @@
- (void)setSelectedCountryCode:(NSString *)countryCode animated:(BOOL)animated;
- (void)setSelectedCountryName:(NSString *)countryName animated:(BOOL)animated;
- (void)setSelectedLocale:(NSLocale *)locale animated:(BOOL)animated;

- (UIImage *)getSelectedFlag:(NSInteger)row;
@end
24 changes: 17 additions & 7 deletions CountryPicker/CountryPicker.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,18 @@ - (NSLocale *)selectedLocale
return nil;
}

- (UIImage *)getSelectedFlag:(NSInteger)row
{
NSString *imagePath = [NSString stringWithFormat:@"CountryPicker.bundle/%@", [[self class] countryCodes][(NSUInteger) row]];
UIImage *image;
if ([[UIImage class] respondsToSelector:@selector(imageNamed:inBundle:compatibleWithTraitCollection:)])
image = [UIImage imageNamed:imagePath inBundle:[NSBundle bundleForClass:[CountryPicker class]] compatibleWithTraitCollection:nil];
else
image = [UIImage imageNamed:imagePath];

return image;
}

#pragma mark -
#pragma mark UIPicker

Expand Down Expand Up @@ -242,12 +254,7 @@ - (UIView *)pickerView:(__unused UIPickerView *)pickerView viewForRow:(NSInteger
}

((UILabel *)[view viewWithTag:1]).text = [[self class] countryNames][(NSUInteger)row];
NSString *imagePath = [NSString stringWithFormat:@"CountryPicker.bundle/%@", [[self class] countryCodes][(NSUInteger) row]];
UIImage *image;
if ([[UIImage class] respondsToSelector:@selector(imageNamed:inBundle:compatibleWithTraitCollection:)])
image = [UIImage imageNamed:imagePath inBundle:[NSBundle bundleForClass:[CountryPicker class]] compatibleWithTraitCollection:nil];
else
image = [UIImage imageNamed:imagePath];
UIImage *image = [self getSelectedFlag:row];
((UIImageView *)[view viewWithTag:2]).image = image;


Expand All @@ -258,8 +265,11 @@ - (void)pickerView:(__unused UIPickerView *)pickerView
didSelectRow:(__unused NSInteger)row
inComponent:(__unused NSInteger)component
{

UIImage *image = [self getSelectedFlag:row];

__strong id<CountryPickerDelegate> strongDelegate = delegate;
[strongDelegate countryPicker:self didSelectCountryWithName:self.selectedCountryName code:self.selectedCountryCode];
[strongDelegate countryPicker:self didSelectCountryWithName:self.selectedCountryName code:self.selectedCountryCode flag:image];
}

@end
2 changes: 2 additions & 0 deletions Examples/CountryPickerDemo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@
01D39FCD14E60FBC002FC9B1 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
INFOPLIST_FILE = "CountryPickerDemo/CountryPickerDemo-Info.plist";
Expand All @@ -367,6 +368,7 @@
01D39FCE14E60FBC002FC9B1 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
INFOPLIST_FILE = "CountryPickerDemo/CountryPickerDemo-Info.plist";
Expand Down
7 changes: 7 additions & 0 deletions Examples/CountryPickerDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added ...odeproj/project.xcworkspace/xcuserdata/tovarna.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
91 changes: 91 additions & 0 deletions ...yPickerDemo.xcodeproj/xcuserdata/tovarna.xcuserdatad/xcschemes/CountryPickerDemo.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "01D39FAD14E60FBC002FC9B1"
BuildableName = "CountryPickerDemo.app"
BlueprintName = "CountryPickerDemo"
ReferencedContainer = "container:CountryPickerDemo.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "01D39FAD14E60FBC002FC9B1"
BuildableName = "CountryPickerDemo.app"
BlueprintName = "CountryPickerDemo"
ReferencedContainer = "container:CountryPickerDemo.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "01D39FAD14E60FBC002FC9B1"
BuildableName = "CountryPickerDemo.app"
BlueprintName = "CountryPickerDemo"
ReferencedContainer = "container:CountryPickerDemo.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "01D39FAD14E60FBC002FC9B1"
BuildableName = "CountryPickerDemo.app"
BlueprintName = "CountryPickerDemo"
ReferencedContainer = "container:CountryPickerDemo.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
22 changes: 22 additions & 0 deletions ...tryPickerDemo.xcodeproj/xcuserdata/tovarna.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>CountryPickerDemo.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>01D39FAD14E60FBC002FC9B1</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
1 change: 1 addition & 0 deletions Examples/CountryPickerDemo/ViewController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@

@property (nonatomic, strong) IBOutlet UILabel *nameLabel;
@property (nonatomic, strong) IBOutlet UILabel *codeLabel;
@property (weak, nonatomic) IBOutlet UIImageView *flagView;

@end
3 changes: 2 additions & 1 deletion Examples/CountryPickerDemo/ViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ @implementation ViewController

@synthesize nameLabel, codeLabel;

- (void)countryPicker:(__unused CountryPicker *)picker didSelectCountryWithName:(NSString *)name code:(NSString *)code
- (void)countryPicker:(__unused CountryPicker *)picker didSelectCountryWithName:(NSString *)name code:(NSString *)code flag:(UIImage *)flag
{
self.nameLabel.text = name;
self.codeLabel.text = code;
self.flagView.image = flag;
}

@end
Loading