From 19a7be59becf4eb8b0fafa0e044dec0c1f23d725 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Thu, 12 Dec 2019 16:49:48 +1100
Subject: [PATCH] WIP

---
 .../MediaDetailViewController.m               | 13 +++++++++
 .../MediaPageViewController.swift             | 27 ++++++++++++-------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/Signal/src/ViewControllers/MediaDetailViewController.m b/Signal/src/ViewControllers/MediaDetailViewController.m
index 9874c83c3..5aa94b184 100644
--- a/Signal/src/ViewControllers/MediaDetailViewController.m
+++ b/Signal/src/ViewControllers/MediaDetailViewController.m
@@ -110,6 +110,19 @@ NS_ASSUME_NONNULL_BEGIN
     self.view.backgroundColor = [UIColor clearColor];
 
     [self updateContents];
+    
+    // Loki: Set gradient background
+    self.view.backgroundColor = UIColor.clearColor;
+    LKGradient *gradient = LKGradients.defaultLokiBackground;
+    self.view.backgroundColor = UIColor.clearColor;
+    [self.view setGradient:gradient];
+    
+    // Loki: Set navigation bar background color
+    UINavigationBar *navigationBar = self.navigationController.navigationBar;
+    [navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
+    navigationBar.shadowImage = [UIImage new];
+    [navigationBar setTranslucent:NO];
+    navigationBar.barTintColor = LKColors.navigationBarBackground;
 }
 
 - (void)viewWillAppear:(BOOL)animated
diff --git a/Signal/src/ViewControllers/MediaPageViewController.swift b/Signal/src/ViewControllers/MediaPageViewController.swift
index fa765971d..61cafc88b 100644
--- a/Signal/src/ViewControllers/MediaPageViewController.swift
+++ b/Signal/src/ViewControllers/MediaPageViewController.swift
@@ -163,11 +163,15 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
 
         let footerBar = self.makeClearToolbar()
         self.footerBar = footerBar
-        footerBar.tintColor = .white
+        footerBar.tintColor = Colors.text
+        footerBar.setBackgroundImage(UIImage(), forToolbarPosition: .any, barMetrics: UIBarMetrics.default)
+        footerBar.setShadowImage(UIImage(), forToolbarPosition: .any)
+        footerBar.isTranslucent = false
+        footerBar.barTintColor = Colors.navigationBarBackground
 
         let bottomContainer = UIView()
         self.bottomContainer = bottomContainer
-        bottomContainer.backgroundColor = UIColor.ows_black.withAlphaComponent(0.4)
+        bottomContainer.backgroundColor = Colors.navigationBarBackground
 
         let bottomStack = UIStackView(arrangedSubviews: [captionContainerView, galleryRailView, footerBar])
         bottomStack.axis = .vertical
@@ -190,6 +194,12 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
         let verticalSwipe = UISwipeGestureRecognizer(target: self, action: #selector(didSwipeView))
         verticalSwipe.direction = [.up, .down]
         view.addGestureRecognizer(verticalSwipe)
+        
+        let navigationBar = navigationController!.navigationBar
+        navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
+        navigationBar.shadowImage = UIImage()
+        navigationBar.isTranslucent = false
+        navigationBar.barTintColor = Colors.navigationBarBackground
     }
 
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
@@ -239,10 +249,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
     private func makeClearToolbar() -> UIToolbar {
         let toolbar = UIToolbar()
 
-        toolbar.backgroundColor = UIColor.clear
-
-        // Making a toolbar transparent requires setting an empty uiimage
-        toolbar.setBackgroundImage(UIImage(), forToolbarPosition: .any, barMetrics: .default)
+        toolbar.backgroundColor = Colors.navigationBarBackground
 
         // hide 1px top-border
         toolbar.clipsToBounds = true
@@ -701,8 +708,8 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
 
     lazy private var portraitHeaderNameLabel: UILabel = {
         let label = UILabel()
-        label.textColor = Theme.darkThemePrimaryColor
-        label.font = UIFont.ows_regularFont(withSize: 17)
+        label.textColor = Colors.text
+        label.font = .systemFont(ofSize: Values.mediumFontSize)
         label.textAlignment = .center
         label.adjustsFontSizeToFitWidth = true
         label.minimumScaleFactor = 0.8
@@ -712,8 +719,8 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
 
     lazy private var portraitHeaderDateLabel: UILabel = {
         let label = UILabel()
-        label.textColor = Theme.darkThemePrimaryColor
-        label.font = UIFont.ows_regularFont(withSize: 12)
+        label.textColor = Colors.text
+        label.font = .systemFont(ofSize: Values.verySmallFontSize)
         label.textAlignment = .center
         label.adjustsFontSizeToFitWidth = true
         label.minimumScaleFactor = 0.8