Skip to content
This repository has been archived by the owner on Apr 6, 2020. It is now read-only.

support iOS 13 dark mode #224

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 23 additions & 0 deletions QBImagePicker.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@
74BB93661B2CE91A0044EB60 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/QBImagePicker.strings; sourceTree = "<group>"; };
790A850D1AE7D4D9008E2A80 /* QBSlomoIconView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QBSlomoIconView.h; sourceTree = "<group>"; };
790A850E1AE7D4D9008E2A80 /* QBSlomoIconView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QBSlomoIconView.m; sourceTree = "<group>"; };
8540473E235EA4D100FFC390 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/QBImagePicker.strings"; sourceTree = "<group>"; };
8540473F235EA7D300FFC390 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/QBImagePicker.strings; sourceTree = "<group>"; };
85404740235EA7E100FFC390 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/QBImagePicker.strings; sourceTree = "<group>"; };
85404741235EA7F400FFC390 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/QBImagePicker.strings; sourceTree = "<group>"; };
858E05F226F08EFE007E4652 /* QBImagePickerDemo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = QBImagePickerDemo.entitlements; sourceTree = "<group>"; };
AA3AD06D1ACF9A3A00BF523E /* QBVideoIconView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QBVideoIconView.h; sourceTree = "<group>"; };
AA3AD06E1ACF9A3A00BF523E /* QBVideoIconView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QBVideoIconView.m; sourceTree = "<group>"; };
AA3AD0711ACFA06700BF523E /* QBVideoIndicatorView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QBVideoIndicatorView.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -254,6 +259,7 @@
AAA8FE281ACDA0CE002A9710 /* QBImagePickerDemo */ = {
isa = PBXGroup;
children = (
858E05F226F08EFE007E4652 /* QBImagePickerDemo.entitlements */,
AAA8FE2D1ACDA0CE002A9710 /* AppDelegate.h */,
AAA8FE2E1ACDA0CE002A9710 /* AppDelegate.m */,
AAA8FE301ACDA0CE002A9710 /* ViewController.h */,
Expand Down Expand Up @@ -434,13 +440,18 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
ja,
"zh-Hans",
es,
de,
pl,
"zh-Hant",
ko,
it,
fr,
);
mainGroup = AAA8FDF91ACDA079002A9710;
productRefGroup = AAA8FE041ACDA079002A9710 /* Products */;
Expand Down Expand Up @@ -580,6 +591,10 @@
07A50A481B331A840010E048 /* es */,
74BB93661B2CE91A0044EB60 /* de */,
F167DB441C086AB90045AD5B /* pl */,
8540473E235EA4D100FFC390 /* zh-Hant */,
8540473F235EA7D300FFC390 /* ko */,
85404740235EA7E100FFC390 /* it */,
85404741235EA7F400FFC390 /* fr */,
);
name = QBImagePicker.strings;
sourceTree = "<group>";
Expand Down Expand Up @@ -711,6 +726,7 @@
AAA8FE1D1ACDA079002A9710 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Expand All @@ -726,6 +742,7 @@
AAA8FE1E1ACDA079002A9710 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = QBImagePickerTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand All @@ -738,6 +755,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = QBImagePickerDemo/QBImagePickerDemo.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
Expand All @@ -746,17 +765,21 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "jp.questbeat.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
};
name = Debug;
};
AAA8FE491ACDA0CE002A9710 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = QBImagePickerDemo/QBImagePickerDemo.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
INFOPLIST_FILE = QBImagePickerDemo/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "jp.questbeat.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
};
name = Release;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?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>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
13 changes: 11 additions & 2 deletions QBImagePicker/QBAssetsViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,17 @@ - (void)setUpToolbarItems
// Space
UIBarButtonItem *leftSpace = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:NULL];
UIBarButtonItem *rightSpace = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:NULL];

// Info label
NSDictionary *attributes = @{ NSForegroundColorAttributeName: [UIColor blackColor] };

NSDictionary *attributes;
if (@available(iOS 13.0, *)) {
attributes = @{ NSForegroundColorAttributeName: [UIColor labelColor] };
} else {
// Fallback on earlier versions
attributes = @{ NSForegroundColorAttributeName: [UIColor blackColor] };
}

UIBarButtonItem *infoButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:NULL];
infoButtonItem.enabled = NO;
[infoButtonItem setTitleTextAttributes:attributes forState:UIControlStateNormal];
Expand Down Expand Up @@ -661,4 +669,5 @@ - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollection
return CGSizeMake(width, width);
}


@end
Loading