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

Minor improvements #28

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Minor improvements #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f101757
Add script to track DashSync version
podkovyrin Jan 9, 2019
f1f9f9f
Upgrade Xcode project
podkovyrin Jan 9, 2019
5acd33f
Fix some warnings
podkovyrin Jan 9, 2019
f3efaac
Fix snapshot tests
podkovyrin Jan 9, 2019
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
27 changes: 24 additions & 3 deletions DashControl.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,13 @@
2A6FBEF5207C0CFF0055BAC8 /* News.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A6FBEF4207C0CFF0055BAC8 /* News.storyboard */; };
2A6FBEFA207C97510055BAC8 /* ProposalDetailVotesView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A6FBEF9207C97510055BAC8 /* ProposalDetailVotesView.m */; };
2A6FBEFD207C98410055BAC8 /* ProposalDetailVotesViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A6FBEFC207C98410055BAC8 /* ProposalDetailVotesViewModel.m */; };
2A7DCCD720DB63FC0097049F /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = 2A7DCCD920DB63FC0097049F /* Localizable.stringsdict */; };
2A7F8F6E20F32D030048A9ED /* IPAddressTextFieldFormCellModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A7F8F6D20F32D030048A9ED /* IPAddressTextFieldFormCellModel.m */; };
2A7F8F7120F330670048A9ED /* PrivateKeyTextFieldFormCellModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A7F8F7020F330670048A9ED /* PrivateKeyTextFieldFormCellModel.m */; };
2A7F8F7B20F476070048A9ED /* DCBudgetProposalVoteEntity+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A7F8F7920F476070048A9ED /* DCBudgetProposalVoteEntity+CoreDataClass.m */; };
2A7F8F7C20F476070048A9ED /* DCBudgetProposalVoteEntity+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A7F8F7A20F476070048A9ED /* DCBudgetProposalVoteEntity+CoreDataProperties.m */; };
2A7F8F7F20F557320048A9ED /* UIImage+DCAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A7F8F7E20F557320048A9ED /* UIImage+DCAdditions.m */; };
2A7F8F8220F7359D0048A9ED /* PrivateKeyQRScannerViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A7F8F8120F7359D0048A9ED /* PrivateKeyQRScannerViewModel.m */; };
2A7DCCD720DB63FC0097049F /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = 2A7DCCD920DB63FC0097049F /* Localizable.stringsdict */; };
2A80B584203699E70015E1AA /* DCPersistenceStack.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A80B583203699E70015E1AA /* DCPersistenceStack.m */; };
2A80B58720369E7F0015E1AA /* NSData+Hash.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A80B58620369E7F0015E1AA /* NSData+Hash.m */; };
2A80B58A2036A8F40015E1AA /* DCLogging.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A80B5892036A8F40015E1AA /* DCLogging.m */; };
Expand Down Expand Up @@ -501,6 +501,7 @@
2A6FBEF9207C97510055BAC8 /* ProposalDetailVotesView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ProposalDetailVotesView.m; sourceTree = "<group>"; };
2A6FBEFB207C98410055BAC8 /* ProposalDetailVotesViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ProposalDetailVotesViewModel.h; sourceTree = "<group>"; };
2A6FBEFC207C98410055BAC8 /* ProposalDetailVotesViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ProposalDetailVotesViewModel.m; sourceTree = "<group>"; };
2A7DCCD820DB63FC0097049F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
2A7F8F6C20F32D030048A9ED /* IPAddressTextFieldFormCellModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IPAddressTextFieldFormCellModel.h; sourceTree = "<group>"; };
2A7F8F6D20F32D030048A9ED /* IPAddressTextFieldFormCellModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IPAddressTextFieldFormCellModel.m; sourceTree = "<group>"; };
2A7F8F6F20F330670048A9ED /* PrivateKeyTextFieldFormCellModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrivateKeyTextFieldFormCellModel.h; sourceTree = "<group>"; };
Expand All @@ -513,7 +514,6 @@
2A7F8F7E20F557320048A9ED /* UIImage+DCAdditions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIImage+DCAdditions.m"; sourceTree = "<group>"; };
2A7F8F8020F7359D0048A9ED /* PrivateKeyQRScannerViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrivateKeyQRScannerViewModel.h; sourceTree = "<group>"; };
2A7F8F8120F7359D0048A9ED /* PrivateKeyQRScannerViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PrivateKeyQRScannerViewModel.m; sourceTree = "<group>"; };
2A7DCCD820DB63FC0097049F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
2A80B582203699E70015E1AA /* DCPersistenceStack.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DCPersistenceStack.h; sourceTree = "<group>"; };
2A80B583203699E70015E1AA /* DCPersistenceStack.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DCPersistenceStack.m; sourceTree = "<group>"; };
2A80B58520369E7F0015E1AA /* NSData+Hash.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSData+Hash.h"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1674,6 +1674,7 @@
buildConfigurationList = FB84EDD71F32898700E4D400 /* Build configuration list for PBXNativeTarget "DashControl" */;
buildPhases = (
B13CDC11D77705DD862345F6 /* [CP] Check Pods Manifest.lock */,
2A689C7321E646EF00E7C4BA /* Run Script - DashSync Version */,
2A44D5B820E9F0C40033E46B /* [Carthage] Run Script Copy Frameworks */,
FB84EDB91F32898700E4D400 /* Sources */,
FB84EDBA1F32898700E4D400 /* Frameworks */,
Expand All @@ -1698,11 +1699,12 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0930;
LastUpgradeCheck = 0930;
LastUpgradeCheck = 1010;
ORGANIZATIONNAME = dashfoundation;
TargetAttributes = {
2AF39E88209AE7E100479948 = {
CreatedOnToolsVersion = 9.3;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
TestTargetID = FB84EDBC1F32898700E4D400;
};
Expand Down Expand Up @@ -1861,6 +1863,24 @@
shellPath = /bin/sh;
shellScript = "/usr/local/bin/carthage copy-frameworks";
};
2A689C7321E646EF00E7C4BA /* Run Script - DashSync Version */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Run Script - DashSync Version";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/scripts/dashsync_version.sh\"\n";
};
2AB9AA7B20454F85005979C4 /* [Carthage] Run Script Copy Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -2450,6 +2470,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
Expand Down
2 changes: 1 addition & 1 deletion DashControl.xcodeproj/xcshareddata/xcschemes/DashControl.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 = "0930"
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion DashControl.xcodeproj/xcshareddata/xcschemes/DashControlSnapshots.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 = "0930"
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion DashControl/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ - (void)applicationWillTerminate:(UIApplication *)application {

#pragma mark - NSUserActivity Search API

- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)activity restorationHandler:(void (^)(NSArray *))restorationHandler {
- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)activity restorationHandler:(void(^)(NSArray<id<UIUserActivityRestoring>> * __nullable restorableObjects))restorationHandler {
BOOL wasHandled = NO;
if ([activity.activityType isEqual:CSSearchableItemActionType]) {
NSString *activityIdentifier = [activity.userInfo valueForKey:CSSearchableItemActivityIdentifier];
Expand Down
20 changes: 0 additions & 20 deletions DashControl/Resources/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,25 +57,6 @@
</objects>
<point key="canvasLocation" x="661" y="-85"/>
</scene>
<!--Price-->
<scene sceneID="86E-We-Wtr">
<objects>
<viewControllerPlaceholder storyboardName="Price" id="820-gR-pAB" sceneMemberID="viewController">
<tabBarItem key="tabBarItem" title="Price" image="tabBarPrice" id="chu-OR-gwb">
<attributedString key="userComments">
<fragment content="#bc-ignore!">
<attributes>
<font key="NSFont" metaFont="smallSystem"/>
<paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
</attributedString>
</tabBarItem>
</viewControllerPlaceholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="Jqr-jc-PuQ" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="659" y="79"/>
</scene>
<!--Portfolio-->
<scene sceneID="kwK-0P-FzY">
<objects>
Expand Down Expand Up @@ -118,7 +99,6 @@
<resources>
<image name="tabBarNews" width="23" height="23"/>
<image name="tabBarPortfolio" width="23" height="19"/>
<image name="tabBarPrice" width="21" height="21"/>
<image name="tabBarProposals" width="20" height="20"/>
</resources>
</document>
10 changes: 5 additions & 5 deletions DashControlSnapshots/DashControlSnapshots.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ class DashControlSnapshots: XCTestCase {

// ----------------------------

tabBarsQuery.buttons["Price"].tap()
app.staticTexts["1W"].tap()
app.staticTexts["4H"].tap()
snapshot("2Price")
// tabBarsQuery.buttons["Price"].tap()
// app.staticTexts["1W"].tap()
// app.staticTexts["4H"].tap()
//
// snapshot("2Price")

// ----------------------------

Expand Down
1 change: 1 addition & 0 deletions DashSyncCurrentCommit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a8d56ee248724d73968ff1f7511867f91e70924d
14 changes: 14 additions & 0 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,17 @@ end
target 'DashControlTests' do
app_pods
end

# fixes warnings about unsupported Deployment Target in Xcode 10
post_install do |installer|
installer.pods_project.targets.each do |target|
if ['AFNetworking', 'RuntimeRoutines', 'SDWebImage', 'Godzippa'].include?(target.name)
target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '8.0'
end
end
end

# update info about current DashSync version
system("bash scripts/dashsync_version.sh")
end
2 changes: 1 addition & 1 deletion Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,6 @@ SPEC CHECKSUMS:
SimulatorStatusMagic: 28d4a9d1a500ac7cea0b2b5a43c1c6ddb40ba56c
UIViewController-KeyboardAdditions: a691dc7e63a49854d341455a778ee8497dfc4662

PODFILE CHECKSUM: aed60bb0d69db0a0c58511219052e28fda2ce52e
PODFILE CHECKSUM: 009b67ecef720f9f273d3889da281c0d3028fe4b

COCOAPODS: 1.5.3
6 changes: 6 additions & 0 deletions scripts/dashsync_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

pushd "../DashSync/"
DASHSYNC_COMMIT=`git rev-parse HEAD`
popd
echo "$DASHSYNC_COMMIT" > DashSyncCurrentCommit