From 777d1f378c3d932a1510696b6b4b56abd98d5f66 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Wed, 24 Nov 2021 15:15:34 -0500
Subject: [PATCH] Fix hashtag history view background being opaque

---
 Tusker/Views/Hashtag Cell/HashtagHistoryView.swift  |  5 ++++-
 .../Hashtag Cell/TrendingHashtagTableViewCell.xib   | 13 ++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Tusker/Views/Hashtag Cell/HashtagHistoryView.swift b/Tusker/Views/Hashtag Cell/HashtagHistoryView.swift
index 90226d84..07116acb 100644
--- a/Tusker/Views/Hashtag Cell/HashtagHistoryView.swift	
+++ b/Tusker/Views/Hashtag Cell/HashtagHistoryView.swift	
@@ -15,6 +15,9 @@ class HashtagHistoryView: UIView {
     
     private let curveRadius: CGFloat = 10
     
+    /// The base background color used for the graph fill.
+    var effectiveBackgroundColor = UIColor.systemBackground
+    
     override func layoutSubviews() {
         super.layoutSubviews()
         
@@ -121,7 +124,7 @@ class HashtagHistoryView: UIView {
         var tintGreen: CGFloat = 0
         var tintBlue: CGFloat = 0
         traitCollection.performAsCurrent {
-            backgroundColor!.getRed(&backgroundRed, green: &backgroundGreen, blue: &backgroundBlue, alpha: nil)
+            effectiveBackgroundColor.getRed(&backgroundRed, green: &backgroundGreen, blue: &backgroundBlue, alpha: nil)
             tintColor.getRed(&tintRed, green: &tintGreen, blue: &tintBlue, alpha: nil)
         }
         let blendedRed = (backgroundRed + tintRed) / 2
diff --git a/Tusker/Views/Hashtag Cell/TrendingHashtagTableViewCell.xib b/Tusker/Views/Hashtag Cell/TrendingHashtagTableViewCell.xib
index 2c44fc0b..df56871a 100644
--- a/Tusker/Views/Hashtag Cell/TrendingHashtagTableViewCell.xib	
+++ b/Tusker/Views/Hashtag Cell/TrendingHashtagTableViewCell.xib	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18121" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18091"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -39,7 +39,7 @@
                             </stackView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xrw-2v-ybZ" customClass="HashtagHistoryView" customModule="Tusker" customModuleProvider="target">
                                 <rect key="frame" x="188" y="11" width="100" height="44"/>
-                                <color key="backgroundColor" systemColor="secondarySystemGroupedBackgroundColor"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="44" id="W4C-uw-zWg"/>
                                     <constraint firstAttribute="width" constant="100" id="XHb-vd-qNk"/>
@@ -64,9 +64,4 @@
             <point key="canvasLocation" x="132" y="132"/>
         </tableViewCell>
     </objects>
-    <resources>
-        <systemColor name="secondarySystemGroupedBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
-    </resources>
 </document>