Skip to content

Commit

Permalink
Merge pull request #42 from tari-project/floating-panel-component
Browse files Browse the repository at this point in the history 
Floating panel component
  • Loading branch information
@Jasonvdb
Jasonvdb committed Nov 1, 2019
2 parents 07088b2 + 6836cdf commit 2f2e3bf
Show file tree
Hide file tree
Showing 35 changed files with 684 additions and 53 deletions.
128 changes: 126 additions & 2 deletions MobileWallet.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,25 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 51;
objects = {

/* Begin PBXBuildFile section */
00E2BC9B236AAFB100C2A105 /* TransactionsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E2BC9A236AAFB100C2A105 /* TransactionsTableViewController.swift */; };
00E2BC9C236AAFB100C2A105 /* TransactionsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E2BC9A236AAFB100C2A105 /* TransactionsTableViewController.swift */; };
00E2BC9D236AAFB100C2A105 /* TransactionsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E2BC9A236AAFB100C2A105 /* TransactionsTableViewController.swift */; };
00E2BCA9236AB28200C2A105 /* TransactionTableTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E2BCA7236AB28200C2A105 /* TransactionTableTableViewCell.swift */; };
00E2BCAA236AB28200C2A105 /* TransactionTableTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E2BCA7236AB28200C2A105 /* TransactionTableTableViewCell.swift */; };
00E2BCAB236AB28200C2A105 /* TransactionTableTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E2BCA7236AB28200C2A105 /* TransactionTableTableViewCell.swift */; };
00E2BCAC236AB28200C2A105 /* TransactionTableTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 00E2BCA8236AB28200C2A105 /* TransactionTableTableViewCell.xib */; };
00E2BCAD236AB28200C2A105 /* TransactionTableTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 00E2BCA8236AB28200C2A105 /* TransactionTableTableViewCell.xib */; };
00E2BCAE236AB28200C2A105 /* TransactionTableTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 00E2BCA8236AB28200C2A105 /* TransactionTableTableViewCell.xib */; };
00E2BCB2236B455900C2A105 /* HomeViewFloatingPanelLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E2BCB1236B455900C2A105 /* HomeViewFloatingPanelLayout.swift */; };
00E2BCB3236B455900C2A105 /* HomeViewFloatingPanelLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E2BCB1236B455900C2A105 /* HomeViewFloatingPanelLayout.swift */; };
00E2BCB4236B455900C2A105 /* HomeViewFloatingPanelLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E2BCB1236B455900C2A105 /* HomeViewFloatingPanelLayout.swift */; };
00E2BCBA236B5BE800C2A105 /* SendButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E2BCB9236B5BE800C2A105 /* SendButton.swift */; };
00E2BCBB236B5BE800C2A105 /* SendButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E2BCB9236B5BE800C2A105 /* SendButton.swift */; };
00E2BCBC236B5BE800C2A105 /* SendButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E2BCB9236B5BE800C2A105 /* SendButton.swift */; };
00E4919A2366E08B007B332D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E491992366E08B007B332D /* AppDelegate.swift */; };
00E4919C2366E08B007B332D /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E4919B2366E08B007B332D /* SceneDelegate.swift */; };
00E491A32366E08B007B332D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 00E491A12366E08B007B332D /* Main.storyboard */; };
Expand Down Expand Up @@ -41,6 +56,11 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
00E2BC9A236AAFB100C2A105 /* TransactionsTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionsTableViewController.swift; sourceTree = "<group>"; };
00E2BCA7236AB28200C2A105 /* TransactionTableTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionTableTableViewCell.swift; sourceTree = "<group>"; };
00E2BCA8236AB28200C2A105 /* TransactionTableTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TransactionTableTableViewCell.xib; sourceTree = "<group>"; };
00E2BCB1236B455900C2A105 /* HomeViewFloatingPanelLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewFloatingPanelLayout.swift; sourceTree = "<group>"; };
00E2BCB9236B5BE800C2A105 /* SendButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendButton.swift; sourceTree = "<group>"; };
00E491962366E08B007B332D /* Tari.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Tari.app; sourceTree = BUILT_PRODUCTS_DIR; };
00E491992366E08B007B332D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
00E4919B2366E08B007B332D /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -95,6 +115,58 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
00E2BCA6236AB25500C2A105 /* TransactionHistory */ = {
isa = PBXGroup;
children = (
00E2BC9A236AAFB100C2A105 /* TransactionsTableViewController.swift */,
00E2BCA7236AB28200C2A105 /* TransactionTableTableViewCell.swift */,
00E2BCA8236AB28200C2A105 /* TransactionTableTableViewCell.xib */,
);
path = TransactionHistory;
sourceTree = "<group>";
};
00E2BCAF236B44CE00C2A105 /* UIElements */ = {
isa = PBXGroup;
children = (
00E2BCB8236B5BC000C2A105 /* Buttons */,
00E2BCB0236B44DB00C2A105 /* FloatingPanel */,
);
path = UIElements;
sourceTree = "<group>";
};
00E2BCB0236B44DB00C2A105 /* FloatingPanel */ = {
isa = PBXGroup;
children = (
00E2BCB1236B455900C2A105 /* HomeViewFloatingPanelLayout.swift */,
);
path = FloatingPanel;
sourceTree = "<group>";
};
00E2BCB5236B469C00C2A105 /* Screens */ = {
isa = PBXGroup;
children = (
00E2BCB6236B46A400C2A105 /* Home */,
);
path = Screens;
sourceTree = "<group>";
};
00E2BCB6236B46A400C2A105 /* Home */ = {
isa = PBXGroup;
children = (
00E2BCA6236AB25500C2A105 /* TransactionHistory */,
00E4922823683E54007B332D /* HomeViewController.swift */,
);
path = Home;
sourceTree = "<group>";
};
00E2BCB8236B5BC000C2A105 /* Buttons */ = {
isa = PBXGroup;
children = (
00E2BCB9236B5BE800C2A105 /* SendButton.swift */,
);
path = Buttons;
sourceTree = "<group>";
};
00E4918D2366E08B007B332D = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -127,7 +199,8 @@
00E491A92366E08F007B332D /* LaunchScreen.storyboard */,
00E491AC2366E08F007B332D /* Info.plist */,
00E491A42366E08B007B332D /* MobileWallet.xcdatamodeld */,
00E4922823683E54007B332D /* HomeViewController.swift */,
00E2BCAF236B44CE00C2A105 /* UIElements */,
00E2BCB5236B469C00C2A105 /* Screens */,
);
path = MobileWallet;
sourceTree = "<group>";
Expand Down Expand Up @@ -185,6 +258,7 @@
00E491932366E08B007B332D /* Frameworks */,
00E491942366E08B007B332D /* Resources */,
00E491E823670555007B332D /* ShellScript */,
592727B5D4B1A61E8E9269A9 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -222,6 +296,7 @@
00E491B82366E08F007B332D /* Sources */,
00E491B92366E08F007B332D /* Frameworks */,
00E491BA2366E08F007B332D /* Resources */,
B2015F30F7CFEE576E45A5DA /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -282,6 +357,7 @@
buildActionMask = 2147483647;
files = (
00E491AB2366E08F007B332D /* LaunchScreen.storyboard in Resources */,
00E2BCAC236AB28200C2A105 /* TransactionTableTableViewCell.xib in Resources */,
00E491A82366E08F007B332D /* Assets.xcassets in Resources */,
00E491A32366E08B007B332D /* Main.storyboard in Resources */,
);
Expand All @@ -291,13 +367,15 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
00E2BCAD236AB28200C2A105 /* TransactionTableTableViewCell.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
00E491BA2366E08F007B332D /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
00E2BCAE236AB28200C2A105 /* TransactionTableTableViewCell.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -343,6 +421,23 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
592727B5D4B1A61E8E9269A9 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-MobileWallet/Pods-MobileWallet-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-MobileWallet/Pods-MobileWallet-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MobileWallet/Pods-MobileWallet-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
8C27C48421F9037D76C87980 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -387,17 +482,38 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
B2015F30F7CFEE576E45A5DA /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-MobileWallet-MobileWalletUITests/Pods-MobileWallet-MobileWalletUITests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-MobileWallet-MobileWalletUITests/Pods-MobileWallet-MobileWalletUITests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MobileWallet-MobileWalletUITests/Pods-MobileWallet-MobileWalletUITests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
00E491922366E08B007B332D /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
00E2BC9B236AAFB100C2A105 /* TransactionsTableViewController.swift in Sources */,
00E2BCBA236B5BE800C2A105 /* SendButton.swift in Sources */,
00E2BCA9236AB28200C2A105 /* TransactionTableTableViewCell.swift in Sources */,
00E491A62366E08B007B332D /* MobileWallet.xcdatamodeld in Sources */,
00E4919A2366E08B007B332D /* AppDelegate.swift in Sources */,
00E4919C2366E08B007B332D /* SceneDelegate.swift in Sources */,
00E4922923683E54007B332D /* HomeViewController.swift in Sources */,
00E2BCB2236B455900C2A105 /* HomeViewFloatingPanelLayout.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -406,7 +522,11 @@
buildActionMask = 2147483647;
files = (
00E491B62366E08F007B332D /* MobileWalletTests.swift in Sources */,
00E2BCB3236B455900C2A105 /* HomeViewFloatingPanelLayout.swift in Sources */,
00E4922A23683E54007B332D /* HomeViewController.swift in Sources */,
00E2BCBB236B5BE800C2A105 /* SendButton.swift in Sources */,
00E2BC9C236AAFB100C2A105 /* TransactionsTableViewController.swift in Sources */,
00E2BCAA236AB28200C2A105 /* TransactionTableTableViewCell.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -415,7 +535,11 @@
buildActionMask = 2147483647;
files = (
00E491C12366E08F007B332D /* MobileWalletUITests.swift in Sources */,
00E2BCB4236B455900C2A105 /* HomeViewFloatingPanelLayout.swift in Sources */,
00E4922B23683E54007B332D /* HomeViewController.swift in Sources */,
00E2BCBC236B5BE800C2A105 /* SendButton.swift in Sources */,
00E2BC9D236AAFB100C2A105 /* TransactionsTableViewController.swift in Sources */,
00E2BCAB236AB28200C2A105 /* TransactionTableTableViewCell.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
58 changes: 41 additions & 17 deletions MobileWallet/Assets.xcassets/AppIcon.appiconset/Contents.json
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,93 +1,117 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"idiom" : "iphone",
"filename" : "Icon-App-20x20@2x.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"idiom" : "iphone",
"filename" : "Icon-App-20x20@3x.png",
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-App-29x29@1x.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-App-29x29@2x.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-App-29x29@3x.png",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"idiom" : "iphone",
"filename" : "Icon-App-40x40@2x.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"idiom" : "iphone",
"filename" : "Icon-App-40x40@3x.png",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"idiom" : "iphone",
"filename" : "Icon-App-60x60@2x.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"idiom" : "iphone",
"filename" : "Icon-App-60x60@3x.png",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"idiom" : "ipad",
"filename" : "Icon-App-20x20@1x.png",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"idiom" : "ipad",
"filename" : "Icon-App-20x20@2x.png",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"idiom" : "ipad",
"filename" : "Icon-App-29x29@1x.png",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"idiom" : "ipad",
"filename" : "Icon-App-29x29@2x.png",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"idiom" : "ipad",
"filename" : "Icon-App-40x40@1x.png",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"idiom" : "ipad",
"filename" : "Icon-App-40x40@2x.png",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"idiom" : "ipad",
"filename" : "Icon-App-76x76@1x.png",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"idiom" : "ipad",
"filename" : "Icon-App-76x76@2x.png",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"idiom" : "ipad",
"filename" : "Icon-App-83.5x83.5@2x.png",
"scale" : "2x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"idiom" : "ios-marketing",
"filename" : "ItunesArtwork@2x.png",
"scale" : "1x"
}
],
Expand Down
Binary file added MobileWallet/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MobileWallet/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MobileWallet/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MobileWallet/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MobileWallet/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MobileWallet/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MobileWallet/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MobileWallet/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MobileWallet/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MobileWallet/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MobileWallet/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MobileWallet/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MobileWallet/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MobileWallet/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MobileWallet/Assets.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions MobileWallet/Assets.xcassets/Colors/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
20 changes: 20 additions & 0 deletions MobileWallet/Assets.xcassets/Colors/HomeBackground.colorset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
},
"colors" : [
{
"idiom" : "universal",
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "0.897",
"alpha" : "1.000",
"blue" : "0.897",
"green" : "0.897"
}
}
}
]
}

0 comments on commit 2f2e3bf

Please sign in to comment.