Skip to content

Commit

Permalink
Merge pull request #32 from surfstudio/SPT-1506-combine-framework-and…
Browse files Browse the repository at this point in the history
…-example-project

SPT-1506 DebugScreen, объединение example-проекта и фреймворка
  • Loading branch information
chausovSurfStudio committed Jul 10, 2023
2 parents e079c81 + e899b56 commit 895e8d0
Show file tree
Hide file tree
Showing 78 changed files with 1,007 additions and 1,342 deletions.
19 changes: 19 additions & 0 deletions .swiftgen_example.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
xcassets:
- inputs:
- Example/DebugScreenExample/Library/Resources/Images/Assets.xcassets
- Example/DebugScreenExample/Library/Resources/Colors/Colors.xcassets
outputs:
- templateName: swift4
output: Example/DebugScreenExample/Library/Resources/Images/Assets.swift
params:
enumName: Resources
publicAccess: false

strings:
inputs:
- Example/DebugScreenExample/Library/Resources/Strings/ru.lproj/Localizable.strings
outputs:
- templateName: structured-swift4
output: Example/DebugScreenExample/Library/Resources/Strings/Strings.swift
params:
publicAccess: false
674 changes: 673 additions & 1 deletion DebugScreen.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1420"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B2E91F572A4C21E9000E3E45"
BuildableName = "DebugScreenExample.app"
BlueprintName = "DebugScreenExample"
ReferencedContainer = "container:DebugScreen.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B2E91FC32A4C3809000E3E45"
BuildableName = "DebugScreenExampleTests.xctest"
BlueprintName = "DebugScreenExampleTests"
ReferencedContainer = "container:DebugScreen.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B2E91FD02A4C3926000E3E45"
BuildableName = "DebugScreenExampleUITests.xctest"
BlueprintName = "DebugScreenExampleUITests"
ReferencedContainer = "container:DebugScreen.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B2E91F572A4C21E9000E3E45"
BuildableName = "DebugScreenExample.app"
BlueprintName = "DebugScreenExample"
ReferencedContainer = "container:DebugScreen.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B2E91F572A4C21E9000E3E45"
BuildableName = "DebugScreenExample.app"
BlueprintName = "DebugScreenExample"
ReferencedContainer = "container:DebugScreen.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
19 changes: 0 additions & 19 deletions Example/.swiftgen.yml

This file was deleted.

106 changes: 0 additions & 106 deletions Example/.swiftlint.yml

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
willConnectTo session: UISceneSession,
options connectionOptions: UIScene.ConnectionOptions
) {
guard let _ = (scene as? UIWindowScene) else { return }
guard let windowScene = (scene as? UIWindowScene) else {
return
}

window = UIWindow(windowScene: windowScene)
window?.rootViewController = StartViewController()
window?.makeKeyAndVisible()
}

func sceneDidDisconnect(_ scene: UIScene) { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
<string>Default Configuration</string>
<key>UISceneDelegateClassName</key>
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
<key>UISceneStoryboardFile</key>
<string>Main</string>
</dict>
</array>
</dict>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" 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>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,15 @@ internal enum L10n {
/// Моковый (с очень очень очень длинным описанием)
internal static let thirdServerTitle = L10n.tr("Localizable", "ServerSelection.thirdServerTitle")
}

internal enum StartController {
/// Surf
internal static let companyNameLabel = L10n.tr("Localizable", "StartController.companyNameLabel")
/// Встряхни меня!
internal static let shakeMeLabel = L10n.tr("Localizable", "StartController.shakeMeLabel")
/// поддержка shake
internal static let shakeSupportTitleLabel = L10n.tr("Localizable", "StartController.shakeSupportTitleLabel")
}
}
// swiftlint:enable explicit_type_interface function_parameter_count identifier_name line_length
// swiftlint:enable nesting type_body_length type_name vertical_whitespace_opening_braces
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,9 @@

"DestinationController.title" = "Destination controller";
"DestinationController.contentText" = "This is new screen!";

// MARK: - Start Controller

"StartController.companyNameLabel" = "Surf";
"StartController.shakeMeLabel" = "Shake me!";
"StartController.shakeSupportTitleLabel" = "shake support";
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,9 @@

"DestinationController.title" = "Новый экран";
"DestinationController.contentText" = "Это новый экран!";

// MARK: - Start Controller

"StartController.companyNameLabel" = "Surf";
"StartController.shakeMeLabel" = "Встряхни меня!";
"StartController.shakeSupportTitleLabel" = "поддержка shake";

0 comments on commit 895e8d0

Please sign in to comment.