Skip to content

Commit

Permalink
Merge pull request #7 from fingerprintjs/app-submission
Browse files Browse the repository at this point in the history
AppStore submission preparation
  • Loading branch information
petrpalata authored May 12, 2022
2 parents 80f46cf + 32847d5 commit 066278c
Show file tree
Hide file tree
Showing 13 changed files with 349 additions and 39 deletions.
1 change: 1 addition & 0 deletions DemoApp/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Pods/
287 changes: 260 additions & 27 deletions DemoApp/DemoApp.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions DemoApp/DemoApp.xcodeproj/xcshareddata/xcschemes/DemoApp.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,16 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6AD70B16281AF34E003657F6"
BuildableName = "DemoAppUITests.xctest"
BlueprintName = "DemoAppUITests"
ReferencedContainer = "container:DemoApp.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
10 changes: 10 additions & 0 deletions DemoApp/DemoApp.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ struct FingerprintGeneratorView: View {
VStack(alignment: .center, spacing: 20) {
FingerprintView(fingerprintTree: tree)
let detailView = FingerprintDetailView(
fingerprintTree: tree,
rawInfo: viewModel.deviceInfo.debugDescription
fingerprintTree: tree // ,
// rawInfo: viewModel.deviceInfo.debugDescription
)

NavigationLink(destination: detailView) {
Expand All @@ -82,7 +82,7 @@ struct FingerprintGeneratorView: View {
}
.navigationBarTitleDisplayMode(.large)
.navigationBarHidden(false)
}
}.navigationViewStyle(StackNavigationViewStyle())
}

private func computeFingerprint() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ class FingerprintGeneratorViewModel: ObservableObject {
@Published var state: FingerprintGeneratorState = .notGenerated
@Published var loading: Bool = false
@Published var fingerprintTree: FingerprintTree? = nil
@Published var deviceInfo: DeviceInfo? = nil
// @Published var deviceInfo: DeviceInfo? = nil

func generateTree() async {
let deviceInfoProvider = DeviceInfoProvider()
deviceInfo = await deviceInfoProvider.getDeviceInfo()
// let deviceInfoProvider = DeviceInfoProvider()
// deviceInfo = await deviceInfoProvider.getDeviceInfo()
state = .generating
fingerprintTree = await fingerprinter.getFingerprintTree()
if let fingerprintTree = fingerprintTree {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import FingerprintJS

struct FingerprintDetailView: View {
let fingerprintTree: FingerprintTree
let rawInfo: String?
// let rawInfo: String?

var body: some View {
ScrollView {
Expand All @@ -21,13 +21,15 @@ struct FingerprintDetailView: View {
.padding()

InfoTreeView(tree: fingerprintTree)
/*
#if targetEnvironment(simulator)
if let info = rawInfo {
CollapsibleCard("Raw data") {
Text(info).padding()
}.padding()
}
#endif
*/
Spacer()
}
.navigationTitle("Details")
Expand Down
7 changes: 5 additions & 2 deletions DemoApp/DemoApp/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>UILaunchStoryboardName</key>
<string>Launch</string>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
<false/>
</dict>
</dict>
</plist>
6 changes: 3 additions & 3 deletions DemoApp/Launch.storyboard
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<viewController interfaceStyle="light" id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
Expand Down
14 changes: 14 additions & 0 deletions DemoApp/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Uncomment the next line to define a global platform for your project
# platform :ios, '9.0'

target 'DemoApp' do
# Comment the next line if you don't want to use dynamic frameworks
use_frameworks!

pod 'FingerprintJS', '~> 1.0'

target 'DemoAppUITests' do
# Pods for testing
end

end
16 changes: 16 additions & 0 deletions DemoApp/Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
PODS:
- FingerprintJS (1.0.0)

DEPENDENCIES:
- FingerprintJS (~> 1.0)

SPEC REPOS:
trunk:
- FingerprintJS

SPEC CHECKSUMS:
FingerprintJS: 2c0bae1d2f1b65c3c46098edbdefca4a0e72c76d

PODFILE CHECKSUM: f501a0d0aaa742f83340245876e881fc1d89f6c6

COCOAPODS: 1.11.3
13 changes: 13 additions & 0 deletions Sources/fastlane/Matchfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
git_url("[email protected]:fingerprintjs/ios-certificates")

storage_mode("git")

type("development") # The default type, can be: appstore, adhoc, enterprise or development

app_identifier(["com.fingerprintjs.DemoApp"])
# username("[email protected]") # Your Apple Developer Portal username

# For all available options run `fastlane match --help`
# Remove the # in the beginning of the line to enable the other options

# The docs are available on https://docs.fastlane.tools/actions/match

0 comments on commit 066278c

Please sign in to comment.