Skip to content
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

Jump to bottom

Update UI for Big Sur #37

Merged
merged 2 commits into from
Nov 19, 2020
Merged

Update UI for Big Sur #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed2e79c
* Make sidebar use rounded rect selection
greimers Jul 19, 2020
80866eb
Fix toolbar icons for Big Sur
greimers Nov 17, 2020
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
18 changes: 13 additions & 5 deletions Source/Tincta.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
0E39E3432395B29B00EB5F86 /* icons.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0E39E3422395B29B00EB5F86 /* icons.xcassets */; };
0E464D6123A51DE30099F4CD /* AppCenterAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E464D5E23A51DE30099F4CD /* AppCenterAnalytics.framework */; };
0E464D6223A51DE30099F4CD /* AppCenterCrashes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E464D5F23A51DE30099F4CD /* AppCenterCrashes.framework */; };
0E464D6323A51DE30099F4CD /* AppCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E464D6023A51DE30099F4CD /* AppCenter.framework */; };
0E53F00924C462A900A0F693 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0E53F00824C462A900A0F693 /* Colors.xcassets */; };
0E7286D41A85726E008D6395 /* ColorSchemes in Resources */ = {isa = PBXBuildFile; fileRef = 0E7286D21A85726E008D6395 /* ColorSchemes */; };
0E7D0C3323DA3D94008B7E48 /* iconmonstr-iconic-font.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0E7D0C3123DA3D39008B7E48 /* iconmonstr-iconic-font.ttf */; };
0EA8209123DC7DE100671B5C /* TCBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EA8209023DC7DE000671B5C /* TCBackgroundView.m */; };
Expand Down Expand Up @@ -110,6 +111,7 @@
0E464D5F23A51DE30099F4CD /* AppCenterCrashes.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AppCenterCrashes.framework; sourceTree = "<group>"; };
0E464D6023A51DE30099F4CD /* AppCenter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AppCenter.framework; sourceTree = "<group>"; };
0E464D6423A51F030099F4CD /* AppCenterConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppCenterConfig.h; sourceTree = "<group>"; };
0E53F00824C462A900A0F693 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = "<group>"; };
0E7286D21A85726E008D6395 /* ColorSchemes */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ColorSchemes; path = Tincta/ColorSchemes; sourceTree = "<group>"; };
0E7D0C3123DA3D39008B7E48 /* iconmonstr-iconic-font.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "iconmonstr-iconic-font.ttf"; sourceTree = "<group>"; };
0E9FC5E41A6199B100B519EB /* Tincta AppStore-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tincta AppStore-Bridging-Header.h"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -327,6 +329,7 @@
95A5CF181358922D008CA186 /* Supporting Files */,
95A5CF3A135894DE008CA186 /* Icons */,
0E39E3422395B29B00EB5F86 /* icons.xcassets */,
0E53F00824C462A900A0F693 /* Colors.xcassets */,
);
path = Tincta;
sourceTree = "<group>";
Expand Down Expand Up @@ -567,7 +570,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = TC;
LastUpgradeCheck = 1130;
LastUpgradeCheck = 1220;
ORGANIZATIONNAME = "Coding Friends UG";
TargetAttributes = {
95F1D01819AFA3C70022EA99 = {
Expand All @@ -587,7 +590,7 @@
};
};
buildConfigurationList = 95A5CF071358922D008CA186 /* Build configuration list for PBXProject "Tincta" */;
compatibilityVersion = "Xcode 11.0";
compatibilityVersion = "Xcode 12.0";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
Expand Down Expand Up @@ -615,6 +618,7 @@
95F1D04619AFA3C70022EA99 /* Credits.html in Resources */,
0E7286D41A85726E008D6395 /* ColorSchemes in Resources */,
0E39E3432395B29B00EB5F86 /* icons.xcassets in Resources */,
0E53F00924C462A900A0F693 /* Colors.xcassets in Resources */,
95F1D04B19AFA3C70022EA99 /* app_icon_running.icns in Resources */,
95F1D04C19AFA3C70022EA99 /* Syntax Definitions in Resources */,
95F1D04D19AFA3C70022EA99 /* Notification.xib in Resources */,
Expand Down Expand Up @@ -739,6 +743,7 @@
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -791,6 +796,7 @@
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -818,10 +824,11 @@
95F1D07919AFA3C70022EA99 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_EMPTY_BODY = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 4010;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
Expand Down Expand Up @@ -861,10 +868,11 @@
95F1D07A19AFA3C70022EA99 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_EMPTY_BODY = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 4010;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
Expand Down
10 changes: 5 additions & 5 deletions Source/Tincta.xcodeproj/xcshareddata/xcschemes/Tincta AppStore.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1130"
LastUpgradeVersion = "1220"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -17,7 +17,7 @@
BlueprintIdentifier = "95F1D01819AFA3C70022EA99"
BuildableName = "Tincta.app"
BlueprintName = "Tincta AppStore"
ReferencedContainer = "container:tincta.xcodeproj">
ReferencedContainer = "container:Tincta.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -34,7 +34,7 @@
BlueprintIdentifier = "95F1D01819AFA3C70022EA99"
BuildableName = "Tincta.app"
BlueprintName = "Tincta AppStore"
ReferencedContainer = "container:tincta.xcodeproj">
ReferencedContainer = "container:Tincta.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
Expand All @@ -57,7 +57,7 @@
BlueprintIdentifier = "95F1D01819AFA3C70022EA99"
BuildableName = "Tincta.app"
BlueprintName = "Tincta AppStore"
ReferencedContainer = "container:tincta.xcodeproj">
ReferencedContainer = "container:Tincta.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<EnvironmentVariables>
Expand All @@ -81,7 +81,7 @@
BlueprintIdentifier = "95F1D01819AFA3C70022EA99"
BuildableName = "Tincta.app"
BlueprintName = "Tincta AppStore"
ReferencedContainer = "container:tincta.xcodeproj">
ReferencedContainer = "container:Tincta.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
4 changes: 2 additions & 2 deletions Source/Tincta.xcodeproj/xcshareddata/xcschemes/Tincta Tests.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1130"
LastUpgradeVersion = "1220"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -20,7 +20,7 @@
BlueprintIdentifier = "C6FE65F81898617100CC3019"
BuildableName = "Tincta Tests.xctest"
BlueprintName = "Tincta Tests"
ReferencedContainer = "container:tincta.xcodeproj">
ReferencedContainer = "container:Tincta.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
Expand Down
38 changes: 38 additions & 0 deletions Source/Tincta/Colors.xcassets/Accent Color.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.600",
"green" : "0.420",
"red" : "0.520"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.600",
"green" : "0.420",
"red" : "0.520"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
6 changes: 6 additions & 0 deletions Source/Tincta/Colors.xcassets/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions Source/Tincta/Colors.xcassets/Toolbar Color.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.400",
"green" : "0.400",
"red" : "0.400"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.650",
"green" : "0.650",
"red" : "0.650"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
2 changes: 2 additions & 0 deletions Source/Tincta/Credits.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
<b>Attribution:</b>
<br><p>Solarized color profile: Copyright (c) 2011 Ethan Schoonover</p>
<br>
<p>Toolbar icons from <a href="https://iconmonstr.com/">iconmonstr</a></p>
<br>
<p>Many thanks also to Futurice and the <a href="https://spiceprogram.org/">Spice Program</a>.</p>
<br>
<br>
Expand Down
Loading