Skip to content

Commit dfa2bad

Browse files
committed
Clean.
1 parent 43bd732 commit dfa2bad

17 files changed

Lines changed: 79 additions & 116 deletions

File tree

Example Apps/SPQRCode.xcodeproj/project.pbxproj

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
F4D5A51D27E83F9100121852 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D5A51C27E83F9100121852 /* AppDelegate.swift */; };
1212
F4D5A51F27E83F9100121852 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D5A51E27E83F9100121852 /* SceneDelegate.swift */; };
1313
F4D5A52127E83F9100121852 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D5A52027E83F9100121852 /* ViewController.swift */; };
14-
F4D5A52427E83F9100121852 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F4D5A52227E83F9100121852 /* Main.storyboard */; };
1514
F4D5A52627E83F9200121852 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F4D5A52527E83F9200121852 /* Assets.xcassets */; };
1615
F4D5A52927E83F9200121852 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F4D5A52727E83F9200121852 /* LaunchScreen.storyboard */; };
1716
/* End PBXBuildFile section */
@@ -22,7 +21,6 @@
2221
F4D5A51C27E83F9100121852 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
2322
F4D5A51E27E83F9100121852 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
2423
F4D5A52027E83F9100121852 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
25-
F4D5A52327E83F9100121852 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
2624
F4D5A52527E83F9200121852 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
2725
F4D5A52827E83F9200121852 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
2826
F4D5A52A27E83F9200121852 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -66,17 +64,40 @@
6664
sourceTree = "<group>";
6765
};
6866
F4D5A51B27E83F9100121852 /* iOS Example App */ = {
67+
isa = PBXGroup;
68+
children = (
69+
F4FE3B2327E9CD8B00E6E0CD /* App */,
70+
F4FE3B2527E9CD9B00E6E0CD /* Resources */,
71+
F4FE3B2427E9CD9000E6E0CD /* Controllers */,
72+
);
73+
path = "iOS Example App";
74+
sourceTree = "<group>";
75+
};
76+
F4FE3B2327E9CD8B00E6E0CD /* App */ = {
6977
isa = PBXGroup;
7078
children = (
7179
F4D5A51C27E83F9100121852 /* AppDelegate.swift */,
7280
F4D5A51E27E83F9100121852 /* SceneDelegate.swift */,
81+
);
82+
path = App;
83+
sourceTree = "<group>";
84+
};
85+
F4FE3B2427E9CD9000E6E0CD /* Controllers */ = {
86+
isa = PBXGroup;
87+
children = (
7388
F4D5A52027E83F9100121852 /* ViewController.swift */,
74-
F4D5A52227E83F9100121852 /* Main.storyboard */,
89+
);
90+
path = Controllers;
91+
sourceTree = "<group>";
92+
};
93+
F4FE3B2527E9CD9B00E6E0CD /* Resources */ = {
94+
isa = PBXGroup;
95+
children = (
96+
F4D5A52A27E83F9200121852 /* Info.plist */,
7597
F4D5A52527E83F9200121852 /* Assets.xcassets */,
7698
F4D5A52727E83F9200121852 /* LaunchScreen.storyboard */,
77-
F4D5A52A27E83F9200121852 /* Info.plist */,
7899
);
79-
path = "iOS Example App";
100+
path = Resources;
80101
sourceTree = "<group>";
81102
};
82103
/* End PBXGroup section */
@@ -142,7 +163,6 @@
142163
files = (
143164
F4D5A52927E83F9200121852 /* LaunchScreen.storyboard in Resources */,
144165
F4D5A52627E83F9200121852 /* Assets.xcassets in Resources */,
145-
F4D5A52427E83F9100121852 /* Main.storyboard in Resources */,
146166
);
147167
runOnlyForDeploymentPostprocessing = 0;
148168
};
@@ -162,14 +182,6 @@
162182
/* End PBXSourcesBuildPhase section */
163183

164184
/* Begin PBXVariantGroup section */
165-
F4D5A52227E83F9100121852 /* Main.storyboard */ = {
166-
isa = PBXVariantGroup;
167-
children = (
168-
F4D5A52327E83F9100121852 /* Base */,
169-
);
170-
name = Main.storyboard;
171-
sourceTree = "<group>";
172-
};
173185
F4D5A52727E83F9200121852 /* LaunchScreen.storyboard */ = {
174186
isa = PBXVariantGroup;
175187
children = (
@@ -304,10 +316,10 @@
304316
CURRENT_PROJECT_VERSION = 1;
305317
DEVELOPMENT_TEAM = 5KKK9SKF79;
306318
GENERATE_INFOPLIST_FILE = YES;
307-
INFOPLIST_FILE = "iOS Example App/Info.plist";
319+
INFOPLIST_FILE = "iOS Example App/Resources/Info.plist";
308320
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
309321
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
310-
INFOPLIST_KEY_UIMainStoryboardFile = Main;
322+
INFOPLIST_KEY_UIMainStoryboardFile = "";
311323
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
312324
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
313325
LD_RUNPATH_SEARCH_PATHS = (
@@ -332,10 +344,10 @@
332344
CURRENT_PROJECT_VERSION = 1;
333345
DEVELOPMENT_TEAM = 5KKK9SKF79;
334346
GENERATE_INFOPLIST_FILE = YES;
335-
INFOPLIST_FILE = "iOS Example App/Info.plist";
347+
INFOPLIST_FILE = "iOS Example App/Resources/Info.plist";
336348
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
337349
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
338-
INFOPLIST_KEY_UIMainStoryboardFile = Main;
350+
INFOPLIST_KEY_UIMainStoryboardFile = "";
339351
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
340352
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
341353
LD_RUNPATH_SEARCH_PATHS = (

Example Apps/SPQRCode.xcodeproj/xcshareddata/xcschemes/iOS Example App.xcscheme

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "F4D5A51827E83F9100121852"
18-
BuildableName = "SPQRCode.app"
18+
BuildableName = "iOS Example App.app"
1919
BlueprintName = "iOS Example App"
2020
ReferencedContainer = "container:SPQRCode.xcodeproj">
2121
</BuildableReference>
@@ -45,7 +45,7 @@
4545
<BuildableReference
4646
BuildableIdentifier = "primary"
4747
BlueprintIdentifier = "F4D5A51827E83F9100121852"
48-
BuildableName = "SPQRCode.app"
48+
BuildableName = "iOS Example App.app"
4949
BlueprintName = "iOS Example App"
5050
ReferencedContainer = "container:SPQRCode.xcodeproj">
5151
</BuildableReference>
@@ -62,7 +62,7 @@
6262
<BuildableReference
6363
BuildableIdentifier = "primary"
6464
BlueprintIdentifier = "F4D5A51827E83F9100121852"
65-
BuildableName = "SPQRCode.app"
65+
BuildableName = "iOS Example App.app"
6666
BlueprintName = "iOS Example App"
6767
ReferencedContainer = "container:SPQRCode.xcodeproj">
6868
</BuildableReference>

Example Apps/iOS Example App/AppDelegate.swift renamed to Example Apps/iOS Example App/App/AppDelegate.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
//
2-
// AppDelegate.swift
3-
// SPQRCode
4-
//
5-
// Created by Ivan Vorobei on 21.03.22.
6-
//
7-
81
import UIKit
92

103
@main

Example Apps/iOS Example App/SceneDelegate.swift renamed to Example Apps/iOS Example App/App/SceneDelegate.swift

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
1-
//
2-
// SceneDelegate.swift
3-
// SPQRCode
4-
//
5-
// Created by Ivan Vorobei on 21.03.22.
6-
//
7-
81
import UIKit
92

103
class SceneDelegate: UIResponder, UIWindowSceneDelegate {
114

125
var window: UIWindow?
136

14-
157
func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
168
// Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`.
179
// If using a storyboard, the `window` property will automatically be initialized and attached to the scene.

Example Apps/iOS Example App/Base.lproj/Main.storyboard

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import UIKit
2+
import SPQRCode
3+
4+
class ViewController: UIViewController {
5+
6+
override func viewDidAppear(_ animated: Bool) {
7+
super.viewDidAppear(animated)
8+
9+
SPQRCode.scanning(
10+
detect: { data, controller in
11+
return data
12+
}, handled: { data, controller in
13+
controller.dismiss(animated: true)
14+
},
15+
on: self
16+
)
17+
}
18+
}
19+

Example Apps/iOS Example App/Assets.xcassets/AccentColor.colorset/Contents.json renamed to Example Apps/iOS Example App/Resources/Assets.xcassets/AccentColor.colorset/Contents.json

File renamed without changes.

Example Apps/iOS Example App/Assets.xcassets/AppIcon.appiconset/Contents.json renamed to Example Apps/iOS Example App/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@
7070
"scale" : "2x",
7171
"size" : "40x40"
7272
},
73+
{
74+
"idiom" : "ipad",
75+
"scale" : "1x",
76+
"size" : "76x76"
77+
},
7378
{
7479
"idiom" : "ipad",
7580
"scale" : "2x",

Example Apps/iOS Example App/Assets.xcassets/Contents.json renamed to Example Apps/iOS Example App/Resources/Assets.xcassets/Contents.json

File renamed without changes.

Example Apps/iOS Example App/Base.lproj/LaunchScreen.storyboard renamed to Example Apps/iOS Example App/Resources/Base.lproj/LaunchScreen.storyboard

File renamed without changes.

0 commit comments

Comments
 (0)