Make use of tint color configurable

IASKColorSchemeSystem: color scheme replicating the system settings IASKColorSchemeTinted: color scheme where user-editable options are displayed in tintColor fixes #513
futuretap · Oct 30, 2024 · f1f30b1 · f1f30b1
1 parent 8520b49
commit f1f30b1
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 6 deletions.
diff --git a/InAppSettingsKit.podspec b/InAppSettingsKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 	s.name                  = 'InAppSettingsKit'
-	s.version               = '3.8.3'
+	s.version               = '3.8.4'
 	s.summary               = 'This iPhone framework allows settings to be in-app in addition to being in the Settings app.'
 
   s.description      = <<-DESC

diff --git a/InAppSettingsKitSampleApp/Classes/MainViewController.swift b/InAppSettingsKitSampleApp/Classes/MainViewController.swift
@@ -38,6 +38,7 @@ class MainViewController: UIViewController {
 		{
 			settingsVC.delegate = self
 			settingsVC.showDoneButton = segue.identifier == "modal"
+			settingsVC.colorScheme = .tinted
 			settingsViewController = settingsVC
 		} else if let settingsVC = segue.destination as? IASKAppSettingsViewController{
 			settingsVC.delegate = self

diff --git a/Sources/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m b/Sources/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m
@@ -66,6 +66,7 @@ @implementation IASKAppSettingsViewController
 @synthesize childPaneHandler = _childPaneHandler;
 @synthesize currentFirstResponder = _currentFirstResponder;
 @synthesize listParentViewController;
+@synthesize colorScheme = _colorScheme;
 
 #pragma mark accessors
 - (IASKSettingsReader*)settingsReader {
@@ -116,6 +117,18 @@ - (void)setFile:(NSString *)file {
 	}
 }
 
+- (UIColor*)detailTextColor {
+	if (self.colorScheme == IASKColorSchemeSystem) {
+		if (@available(iOS 13.0, *)) {
+			return UIColor.secondaryLabelColor;
+		} else {
+			return [UIColor colorWithRed:0.235294 green:0.235294 blue:0.262745 alpha:0.6];
+		}
+	} else {
+		return self.tintColor;
+	}
+}
+
 - (void)createSelections {
 	NSMutableArray *sectionSelection = [NSMutableArray new];
 	for (int section = 0; section < self.settingsReader.numberOfSections; section++) {
@@ -649,14 +662,14 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
 		BOOL hasTitle = title.length > 0 && !specifier.isItemSpecifier;
 		cell.detailTextLabel.text = [[specifier titleForCurrentValue:currentValue ?: specifier.defaultValue] description];
-		cell.detailTextLabel.textColor = self.tintColor;
+		cell.detailTextLabel.textColor = self.detailTextColor;
 		if (hasTitle) {
 			cell.textLabel.text = title;
 		} else {
 			cell.textLabel.text = cell.detailTextLabel.text;
 			cell.detailTextLabel.text = nil;
 
-			if (!specifier.parentSpecifier) {
+			if (!specifier.parentSpecifier && self.colorScheme == IASKColorSchemeTinted) {
 				cell.textLabel.textColor = self.tintColor;
 			}
 		}
@@ -698,7 +711,10 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 		}
 		cell.userInteractionEnabled = [specifier.type isEqualToString:kIASKDatePickerSpecifier];
 		if ([specifier.type isEqualToString:kIASKDatePickerSpecifier]) {
-			cell.detailTextLabel.textColor = [specifier isEqual:self.settingsReader.selectedSpecifier] ? [UILabel appearanceWhenContainedInInstancesOfClasses:@[UITableViewCell.class]].textColor : self.tintColor;
+			cell.detailTextLabel.textColor = self.detailTextColor;
+			if ([specifier isEqual:self.settingsReader.selectedSpecifier]) {
+				cell.detailTextLabel.textColor = [UILabel appearanceWhenContainedInInstancesOfClasses:@[UITableViewCell.class]].textColor;
+			}
 		}
 	}
 	else if ([specifier.type isEqualToString:kIASKPSTextFieldSpecifier]) {
@@ -766,7 +782,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 					cell.textLabel.text = [self.settingsReader titleForId:valueString];
 				} else {
 					cell.detailTextLabel.text = [self.settingsReader titleForId:valueString];
-					cell.detailTextLabel.textColor = self.tintColor;
+					cell.detailTextLabel.textColor = self.detailTextColor;
 				}
 			}
 		}
@@ -1061,6 +1077,7 @@ - (void)presentChildViewController:(UITableViewController<IASKViewController> *)
 	targetViewController.tableView.cellLayoutMarginsFollowReadableWidth = self.cellLayoutMarginsFollowReadableWidth;
 	_currentChildViewController = targetViewController;
 	targetViewController.settingsStore = self.settingsStore;
+	targetViewController.colorScheme = self.colorScheme;
 	targetViewController.view.tintColor = self.tintColor;
 	if ([specifier.parentSpecifier.type isEqualToString:kIASKListGroupSpecifier]) {
 		NSDictionary *itemDict = @{};

diff --git a/Sources/InAppSettingsKit/include/IASKViewController.h b/Sources/InAppSettingsKit/include/IASKViewController.h
@@ -16,14 +16,25 @@
 @class IASKSettingsReader;
 @protocol IASKSettingsStore;
 
-// protocol all IASK view controllers implement
+typedef NS_ENUM(NSUInteger, IASKColorScheme) {
+	/// color scheme replicating the system settings
+	IASKColorSchemeSystem = 0,
+
+	/// color scheme where user-editable options are displayed in tintColor
+	IASKColorSchemeTinted,
+};
+
+/// protocol all IASK view controllers implement
 @protocol IASKViewController <NSObject>
 
 @property (nonatomic, strong, nullable) IASKSettingsReader* settingsReader;
 @property (nonatomic, strong, nonnull) id<IASKSettingsStore> settingsStore;
 @property (nonatomic, copy, nullable) void (^childPaneHandler)(BOOL doneEditing);
 @property (nonatomic, weak, nullable) UIViewController<IASKViewController> *listParentViewController;
 
+/// defines the use of tintColor, default is `IASKColorSchemeSystem`.
+@property (nonatomic) IASKColorScheme colorScheme;
+
 @optional
 @property (nonatomic, weak, nullable) id currentFirstResponder;