Merge pull request #1362 from stripe/davidme/ios13-topbar

Fix Large Title support in iOS 13
stripe · Sep 9, 2019 · a74e7d5 · a74e7d5
2 parents c4124f0 + f91fd2d
commit a74e7d5
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 0 deletions.
diff --git a/Stripe/UIBarButtonItem+Stripe.m b/Stripe/UIBarButtonItem+Stripe.m
@@ -34,6 +34,11 @@ - (void)stp_setTheme:(STPTheme *)theme {
                                    NSForegroundColorAttributeName: theme.secondaryForegroundColor,
                                    }
                         forState:UIControlStateDisabled];
+    [self setTitleTextAttributes:@{
+                                   NSFontAttributeName: self.style == UIBarButtonItemStylePlain ? theme.font : theme.emphasisFont,
+                                   NSForegroundColorAttributeName: theme.accentColor,
+                                   }
+                        forState:UIControlStateHighlighted];
 }
 
 @end

diff --git a/Stripe/UINavigationBar+Stripe_Theme.m b/Stripe/UINavigationBar+Stripe_Theme.m
@@ -38,6 +38,40 @@ - (void)setStp_theme:(STPTheme *)theme {
                                  NSFontAttributeName: theme.emphasisFont,
                                  NSForegroundColorAttributeName: theme.primaryForegroundColor,
                                  };
+
+#ifdef __IPHONE_13_0
+    if (@available(iOS 13.0, *)) {
+        self.standardAppearance.backgroundColor = theme.secondaryBackgroundColor;
+        self.standardAppearance.titleTextAttributes = self.titleTextAttributes;
+        self.standardAppearance.largeTitleTextAttributes = self.largeTitleTextAttributes;
+        self.standardAppearance.buttonAppearance.normal.titleTextAttributes = @{
+            NSFontAttributeName: theme.font,
+            NSForegroundColorAttributeName: theme.accentColor,
+        };
+        self.standardAppearance.buttonAppearance.highlighted.titleTextAttributes = @{
+            NSFontAttributeName: theme.font,
+            NSForegroundColorAttributeName: theme.accentColor,
+        };
+        self.standardAppearance.buttonAppearance.disabled.titleTextAttributes = @{
+            NSFontAttributeName: theme.font,
+            NSForegroundColorAttributeName: theme.secondaryForegroundColor,
+        };
+        self.standardAppearance.doneButtonAppearance.normal.titleTextAttributes = @{
+            NSFontAttributeName: theme.emphasisFont,
+            NSForegroundColorAttributeName: theme.accentColor,
+        };
+        self.standardAppearance.doneButtonAppearance.highlighted.titleTextAttributes = @{
+            NSFontAttributeName: theme.emphasisFont,
+            NSForegroundColorAttributeName: theme.accentColor,
+        };
+        self.standardAppearance.doneButtonAppearance.disabled.titleTextAttributes = @{
+            NSFontAttributeName: theme.emphasisFont,
+            NSForegroundColorAttributeName: theme.secondaryForegroundColor,
+        };
+        self.scrollEdgeAppearance = self.standardAppearance;
+        self.compactAppearance = self.standardAppearance;
+    }
+#endif
 }