From 4fae247aa602e10324f6614df8c4d760601ecbcd Mon Sep 17 00:00:00 2001 From: Tim Xie Date: Thu, 28 Mar 2024 02:39:55 -0700 Subject: [PATCH] revert to old tnoodle, fix colour --- CubeTime.xcodeproj/project.pbxproj | 2 +- CubeTime/3rdparty-Bridging-Header.h | 2 +- CubeTime/Stats/TimeTrend/TimeTrendViewController.swift | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CubeTime.xcodeproj/project.pbxproj b/CubeTime.xcodeproj/project.pbxproj index 5a8f4941..95e62acb 100644 --- a/CubeTime.xcodeproj/project.pbxproj +++ b/CubeTime.xcodeproj/project.pbxproj @@ -17,7 +17,7 @@ 23418F592BB2A8C900398EE2 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23418F582BB2A8C900398EE2 /* StoreKit.framework */; }; 2359689327A367A0003ED9E1 /* StopwatchManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2359689227A367A0003ED9E1 /* StopwatchManager.swift */; }; 235CD3022BB37C2200F6095A /* TNoodle.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E5B1FCEC2BAD892A007C1688 /* TNoodle.xcframework */; }; - 235CD3032BB37C2200F6095A /* TNoodle.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E5B1FCEC2BAD892A007C1688 /* TNoodle.xcframework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + 235CD3032BB37C2200F6095A /* TNoodle.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E5B1FCEC2BAD892A007C1688 /* TNoodle.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 235CDA0327A786D800F48C89 /* Updates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 235CDA0227A786D800F48C89 /* Updates.swift */; }; 235D6A6729C2C060002D90D8 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 235D6A6629C2C060002D90D8 /* Models.swift */; }; 235D6A6929C2C0D3002D90D8 /* HelperShare.swift in Sources */ = {isa = PBXBuildFile; fileRef = 235D6A6829C2C0D3002D90D8 /* HelperShare.swift */; }; diff --git a/CubeTime/3rdparty-Bridging-Header.h b/CubeTime/3rdparty-Bridging-Header.h index 69889288..d8afa4d4 100644 --- a/CubeTime/3rdparty-Bridging-Header.h +++ b/CubeTime/3rdparty-Bridging-Header.h @@ -2,7 +2,7 @@ #define Bridging_Header_h #import "graal_isolate.h" -#import "libtnoodle.h" +#import "org.worldcubeassociation.tnoodle.scrambles.main.h" #import "getBestAverage.h++" #endif /* Bridging_Header_h */ diff --git a/CubeTime/Stats/TimeTrend/TimeTrendViewController.swift b/CubeTime/Stats/TimeTrend/TimeTrendViewController.swift index 11f2285d..bc611bd8 100644 --- a/CubeTime/Stats/TimeTrend/TimeTrendViewController.swift +++ b/CubeTime/Stats/TimeTrend/TimeTrendViewController.swift @@ -277,7 +277,7 @@ class TimeTrendLineChartScrollView: UIScrollView { xAxis.move(to: CGPoint(x: leftX, y: self.frame.height - CHART_BOTTOM_PADDING - 0.5)) xAxis.lineWidth = 1 xAxis.addLine(to: CGPoint(x: rightX, y: self.frame.height - CHART_BOTTOM_PADDING - 0.5)) - context.setStrokeColor(UIColor(Color("indent0")).cgColor) + context.setStrokeColor(UIColor(Color("dark").opacity(0.16)).cgColor) xAxis.stroke() @@ -362,7 +362,7 @@ class TimeTrendLineChartScrollView: UIScrollView { trendLine.stroke() trendLine.removeAllPoints() trendLine.move(to: mid) - context.setStrokeColor(UIColor(Color("indent0")).cgColor) + context.setStrokeColor(UIColor(Color("dark").opacity(0.16)).cgColor) } else if Penalty(rawValue: prev.solve.penalty) == .dnf { trendLine.stroke() trendLine.removeAllPoints() @@ -579,7 +579,7 @@ class TimeTrendViewController: UIViewController, UIScrollViewDelegate { } let lineView = UIView() - lineView.backgroundColor = UIColor(Color("indent0")) + lineView.backgroundColor = UIColor(Color("dark").opacity(0.16)) view.spacing = 6 view.addArrangedSubview(lineView)