Skip to content

Package Update + Color Extension #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndreasInk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Package Update + Color Extension #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 25 additions & 15 deletions app/FaceBit Companion.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@
01F5FCFD2603A9FF00522884 /* FaceBitDetailsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F5FCFC2603A9FF00522884 /* FaceBitDetailsViewModel.swift */; };
01FAB92525B09400009E5B72 /* FaceBitPerpherial.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01FAB92425B09400009E5B72 /* FaceBitPerpherial.swift */; };
62E39C1363EDD2E412190BA9 /* TimeSeriesDataReadDetailed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 627F500FF65BB21C9B8C2101 /* TimeSeriesDataReadDetailed.swift */; };
E196FEC2297D4680000CB4C8 /* ACarousel in Frameworks */ = {isa = PBXBuildFile; productRef = 013B00E525BB4B1C00319A42 /* ACarousel */; };
E196FEC3297D4680000CB4C8 /* GRDB in Frameworks */ = {isa = PBXBuildFile; productRef = 0103210825FA951B00EC81B4 /* GRDB */; };
E196FEC4297D4680000CB4C8 /* SwiftUIRefresh in Frameworks */ = {isa = PBXBuildFile; productRef = 016CC98F26026B3D00B691C5 /* SwiftUIRefresh */; };
E196FEC6297D46AA000CB4C8 /* Color+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = E196FEC5297D46AA000CB4C8 /* Color+Extension.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -196,13 +200,17 @@
01FAB92025B090FA009E5B72 /* FaceBit Companion.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "FaceBit Companion.entitlements"; sourceTree = "<group>"; };
01FAB92425B09400009E5B72 /* FaceBitPerpherial.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FaceBitPerpherial.swift; sourceTree = "<group>"; };
627F500FF65BB21C9B8C2101 /* TimeSeriesDataReadDetailed.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TimeSeriesDataReadDetailed.swift; path = "GRDB Tables/TimeSeriesDataReadDetailed.swift"; sourceTree = "<group>"; };
E196FEC5297D46AA000CB4C8 /* Color+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+Extension.swift"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
015F992C25AE493500BDD672 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
E196FEC4297D4680000CB4C8 /* SwiftUIRefresh in Frameworks */,
E196FEC3297D4680000CB4C8 /* GRDB in Frameworks */,
E196FEC2297D4680000CB4C8 /* ACarousel in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -255,6 +263,7 @@
013B00ED25BB517A00319A42 /* FaceBit+String.swift */,
0100B4D025D7243600898C05 /* UInt+Extension.swift */,
01E9277C25D99D2500873BD8 /* View+Extension.swift */,
E196FEC5297D46AA000CB4C8 /* Color+Extension.swift */,
016CC9BF2602852C00B691C5 /* ShareUtil.swift */,
01AEF894260D4A9500D6D2E0 /* GRDB+Extension.swift */,
);
Expand Down Expand Up @@ -502,9 +511,9 @@
);
name = "FaceBit Companion";
packageProductDependencies = (
013B00E525BB4B1C00319A42,
0103210825FA951B00EC81B4,
016CC98F26026B3D00B691C5,
013B00E525BB4B1C00319A42 /* ACarousel */,
0103210825FA951B00EC81B4 /* GRDB */,
016CC98F26026B3D00B691C5 /* SwiftUIRefresh */,
);
productName = "FaceBit Companion";
productReference = 015F992F25AE493500BDD672 /* FaceBit Companion.app */;
Expand Down Expand Up @@ -578,9 +587,9 @@
);
mainGroup = 015F992625AE493500BDD672;
packageReferences = (
013B00E425BB4B1C00319A42,
0103210725FA951B00EC81B4,
016CC98E26026B3D00B691C5,
013B00E425BB4B1C00319A42 /* XCRemoteSwiftPackageReference "ACarousel" */,
0103210725FA951B00EC81B4 /* XCRemoteSwiftPackageReference "GRDB.swift" */,
016CC98E26026B3D00B691C5 /* XCRemoteSwiftPackageReference "SwiftUIRefresh" */,
);
productRefGroup = 015F993025AE493500BDD672 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -649,6 +658,7 @@
0103211425FAABCE00EC81B4 /* Event.swift in Sources */,
01BC52E72601152800040149 /* DatabaseViewerView.swift in Sources */,
013B00CD25BB2B6400319A42 /* FaceBit+Bundle.swift in Sources */,
E196FEC6297D46AA000CB4C8 /* Color+Extension.swift in Sources */,
01E9277D25D99D2500873BD8 /* View+Extension.swift in Sources */,
01AEF895260D4A9500D6D2E0 /* GRDB+Extension.swift in Sources */,
0100B4EF25D7996900898C05 /* MaskWearTimeWidget.swift in Sources */,
Expand Down Expand Up @@ -1032,23 +1042,23 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
0103210725FA951B00EC81B4 = {
0103210725FA951B00EC81B4 /* XCRemoteSwiftPackageReference "GRDB.swift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/groue/GRDB.swift.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 5.5.0;
};
};
013B00E425BB4B1C00319A42 = {
013B00E425BB4B1C00319A42 /* XCRemoteSwiftPackageReference "ACarousel" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/JWAutumn/ACarousel";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 0.2.0;
};
};
016CC98E26026B3D00B691C5 = {
016CC98E26026B3D00B691C5 /* XCRemoteSwiftPackageReference "SwiftUIRefresh" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/timbersoftware/SwiftUIRefresh.git";
requirement = {
Expand All @@ -1059,19 +1069,19 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
0103210825FA951B00EC81B4 = {
0103210825FA951B00EC81B4 /* GRDB */ = {
isa = XCSwiftPackageProductDependency;
package = 0103210725FA951B00EC81B4;
package = 0103210725FA951B00EC81B4 /* XCRemoteSwiftPackageReference "GRDB.swift" */;
productName = GRDB;
};
013B00E525BB4B1C00319A42 = {
013B00E525BB4B1C00319A42 /* ACarousel */ = {
isa = XCSwiftPackageProductDependency;
package = 013B00E425BB4B1C00319A42;
package = 013B00E425BB4B1C00319A42 /* XCRemoteSwiftPackageReference "ACarousel" */;
productName = ACarousel;
};
016CC98F26026B3D00B691C5 = {
016CC98F26026B3D00B691C5 /* SwiftUIRefresh */ = {
isa = XCSwiftPackageProductDependency;
package = 016CC98E26026B3D00B691C5;
package = 016CC98E26026B3D00B691C5 /* XCRemoteSwiftPackageReference "SwiftUIRefresh" */;
productName = SwiftUIRefresh;
};
/* End XCSwiftPackageProductDependency section */
Expand Down
20 changes: 20 additions & 0 deletions app/FaceBit Companion/Utils/Color+Extension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//
// Color+Extension.swift
// FaceBit Companion
//
// Created by Andreas Ink on 1/22/23.
//

import SwiftUI

// Easier references to Color for use in SwiftUI
extension Color {
static let primaryBrown = Color("PrimaryBrown")
static let primaryMint = Color("primaryMint")
static let primaryOrange = Color("PrimaryOrange")
static let primaryPurple = Color("PrimaryPurple")
static let primaryWhite = Color("PrimaryWhite")

// Array of colors for styling charts and other views
static let primaries: [Color] = [.primaryMint, .primaryBrown, .primaryOrange, .primaryPurple, .primaryMint.opacity(0.4), .primaryPurple.opacity(0.4), .primaryBrown.opacity(0.4)]
}