Skip to content

Commit da7babb

Browse files
JeehutJeehut
committed
Merge branch 'release/1.1.0' into versions
2 parents 2ed308a + 0186921 commit da7babb

File tree

310 files changed

+5277
-4685
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

310 files changed

+5277
-4685
lines changed

‎.bartycrouch.toml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
[update]
2+
tasks = ["interfaces", "normalize", "translate", "transform"]
3+
4+
[update.interfaces]
5+
paths = ["App/Sources"]
6+
7+
[update.normalize]
8+
paths = ["App/Resources"]
9+
sourceLocale = "en"
10+
harmonizeWithSource = true
11+
sortByKeys = true
12+
13+
[update.translate]
14+
paths = ["App/Resources"]
15+
secret = ""
16+
sourceLocale = "en"
17+
18+
[update.transform]
19+
codePaths = ["App/Sources"]
20+
localizablePaths = ["App/Resources"]
21+
transformer = "swiftgenStructured"
22+
supportedLanguageEnumPath = "App/Resources"
23+
typeName = "BartyCrouch"
24+
translateMethodName = "translate"
25+
26+
[lint]
27+
paths = ["App/Resources"]
28+
duplicateKeys = true
29+
emptyValues = true

‎.env.sample

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
APPLE_ID=
2+
DEV_PORTAL_TEAM_ID=
3+
ITC_TEAM_ID=
4+
MATCH_GIT_URL=

‎.github/workflows/main.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Main
2+
3+
on:
4+
push:
5+
branches: [main]
6+
7+
jobs:
8+
tests:
9+
runs-on: macOS-latest
10+
11+
steps:
12+
- uses: actions/checkout@v2
13+
14+
- name: Build & Run Tests
15+
run: xcodebuild test -scheme App -destination 'platform=iOS Simulator,name=iPad Air (4th generation),OS=latest'

‎.github/workflows/pull_request.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Pull Request
2+
3+
on:
4+
pull_request:
5+
branches: [main]
6+
7+
jobs:
8+
cancel-previous-runs:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- name: Cancel previous runs of this workflow on same branch
13+
uses: rokroskar/[email protected]
14+
env:
15+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16+
17+
tests:
18+
runs-on: macOS-latest
19+
20+
steps:
21+
- uses: actions/checkout@v2
22+
23+
- name: Build & Run Tests
24+
run: xcodebuild test -scheme App -destination 'platform=iOS Simulator,name=iPad Air (4th generation),OS=latest'

‎.gitignore

+31
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1+
## macOS
2+
# General
3+
.DS_Store
4+
.AppleDouble
5+
.LSOverride
6+
7+
# Icon must end with two \r
8+
Icon
9+
10+
11+
# Thumbnails
12+
._*
13+
14+
# Files that might appear in the root of a volume
15+
.DocumentRevisions-V100
16+
.fseventsd
17+
.Spotlight-V100
18+
.TemporaryItems
19+
.Trashes
20+
.VolumeIcon.icns
21+
.com.apple.timemachine.donotpresent
22+
23+
# Directories potentially created on remote AFP share
24+
.AppleDB
25+
.AppleDesktop
26+
Network Trash Folder
27+
Temporary Items
28+
.apdisk
29+
130
# Xcode
231
#
332
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
@@ -64,3 +93,5 @@ fastlane/Preview.html
6493
fastlane/screenshots
6594
fastlane/test_output
6695
fastlane/metadata/review_information
96+
.env
97+
Gemfile.lock

‎.periphery.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
project: Prayer.xcodeproj
2+
schemes: [App]
3+
targets: [App, Tests, UITests]
4+
report_exclude:
5+
- App/Generated/SwiftGen/*.swift
6+
- App/SupportingFiles/*.swift
7+
retain_public: false
8+
quiet: true

‎.projlint.yml

+173
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
shared_variables:
2+
rightholder: Flinesoft
3+
project_name: Prayer
4+
5+
rules:
6+
- xcode_build_phases:
7+
project_path: <:project_name:>.xcodeproj
8+
target_name: App
9+
run_scripts:
10+
BartyCrouch: |
11+
if which bartycrouch > /dev/null; then
12+
bartycrouch update -x
13+
bartycrouch lint -x
14+
else
15+
echo "warning: BartyCrouch not installed, download it from https://github.com/Flinesoft/BartyCrouch"
16+
fi
17+
18+
SwiftGen: |
19+
if which swiftgen > /dev/null; then
20+
swiftgen
21+
else
22+
echo "warning: SwiftGen not installed, download it from https://github.com/AliSoftware/SwiftGen"
23+
fi
24+
25+
SwiftLint: |
26+
if which swiftlint > /dev/null; then
27+
swiftlint --quiet
28+
else
29+
echo "warning: SwiftLint not installed, download it from https://github.com/realm/SwiftLint"
30+
fi
31+
32+
ProjLint: |
33+
if which projlint > /dev/null; then
34+
projlint lint --xcode --timeout 2 --ignore-network-errors
35+
else
36+
echo "warning: ProjLint not installed, download it from https://github.com/JamitLabs/ProjLint"
37+
fi
38+
39+
- xcode_project_navigator:
40+
project_path: <:project_name:>.xcodeproj
41+
sorted:
42+
- App/Sources
43+
- App/Resources
44+
- App/SupportingFiles
45+
- App/Generated
46+
- Tests/Sources
47+
- Tests/Resources
48+
- Tests/SupportingFiles
49+
- UITests/Sources
50+
- UITests/Resources
51+
- UITests/SupportingFiles
52+
inner_group_order: []
53+
structure:
54+
- App:
55+
- Sources:
56+
- AppDelegate.swift
57+
- Globals:
58+
- Extensions
59+
- Resources:
60+
- Colors.xcassets
61+
- Images.xcassets
62+
- Localizable.strings
63+
- Fonts
64+
- SupportingFiles:
65+
- App.entitlements
66+
- BartyCrouch.swift
67+
- LaunchScreen.storyboard
68+
- Info.plist
69+
- InfoPlist.strings
70+
- Generated:
71+
- SwiftGen:
72+
- Assets.swift
73+
- Storyboards.swift
74+
- Strings.swift
75+
- Tests:
76+
- Sources
77+
- Resources
78+
- SupportingFiles:
79+
- Info.plist
80+
- UITests:
81+
- Sources
82+
- Resources
83+
- SupportingFiles:
84+
- Info.plist
85+
- Extensions
86+
- RootFiles:
87+
- .bartycrouch.toml
88+
- .envrc
89+
- .gitignore
90+
- .periphery.yml
91+
- .projlint.yml
92+
- .swiftlint.yml
93+
- beak.swift
94+
- Brewfile
95+
- Cartfile
96+
- Cartfile.resolved
97+
- SwiftGen-xcassets.stencil
98+
- swiftgen.yml
99+
- Frameworks:
100+
- Carthage:
101+
- App
102+
- Tests
103+
- Local:
104+
- App
105+
- Tests
106+
- Products
107+
- file_content_regex:
108+
matching_all:
109+
Cartfile:
110+
- "#\\s*[^\\s]+" # Ensure dependencies are commented
111+
- HandySwift
112+
- HandyUIKit
113+
- MungoHealer
114+
- SwiftyBeaver
115+
- SwiftyUserDefaults
116+
.envrc:
117+
- "PATH_add ./Scripts/SymLinks"
118+
.gitignore:
119+
- Scripts/SymLinks
120+
- Carthage/Build
121+
- .build
122+
Brewfile:
123+
- beak
124+
- direnv
125+
not_matching_all:
126+
Cartfile: # Moya already includes Alamofire, prevent redundancy
127+
- Alamofire
128+
- Moya
129+
- file_content_template:
130+
matching:
131+
.swiftlint.yml:
132+
template_url: "https://raw.githubusercontent.com/JamitLabs/ProjLintTemplates/master/JamitLabs/App/SwiftLint.stencil"
133+
parameters:
134+
rightholder: <:rightholder:>
135+
.projlint.yml:
136+
template_url: "https://raw.githubusercontent.com/JamitLabs/ProjLintTemplates/master/JamitLabs/App/ProjLint.stencil"
137+
parameters:
138+
rightholder: <:rightholder:>
139+
project_name: <:project_name:>
140+
- file_existence:
141+
existing_paths:
142+
- .bartycrouch.toml
143+
- .envrc
144+
- .gitignore
145+
- .periphery.yml
146+
- .projlint.yml
147+
- .swiftlint.yml
148+
- beak.swift
149+
- Brewfile
150+
- Cartfile
151+
- Cartfile.resolved
152+
- README.md
153+
- SwiftGen-xcassets.stencil
154+
- swiftgen.yml
155+
- <:project_name:>.xcodeproj/xcshareddata/IDETemplateMacros.plist
156+
- App/Sources/AppDelegate.swift
157+
- App/Sources/Globals/Branding.swift
158+
- App/Sources/Globals/ErrorHandler.swift
159+
- App/Sources/Globals/Logger.swift
160+
- App/Generated/SwiftGen/Assets.swift
161+
- App/Generated/SwiftGen/Storyboards.swift
162+
- App/Generated/SwiftGen/Strings.swift
163+
- App/SupportingFiles/Info.plist
164+
- App/Resources/de.lproj/Localizable.strings
165+
- App/Resources/en.lproj/Localizable.strings
166+
- App/Resources/Colors.xcassets/Contents.json
167+
- App/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
168+
- Scripts/ci.swift
169+
- Scripts/deps.swift
170+
- Scripts/project.swift
171+
- Scripts/tools.swift
172+
- Tests/SupportingFiles/Info.plist
173+
- UITests/SupportingFiles/Info.plist

‎.swift-format

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"lineBreakAroundMultilineExpressionChainComponents": true,
3+
"lineBreakBeforeControlFlowKeywords": true,
4+
"lineBreakBeforeEachArgument": true,
5+
"lineBreakBeforeEachGenericRequirement": true,
6+
"lineLength": 120,
7+
"prioritizeKeepingFunctionOutputTogether": true,
8+
"rules": {
9+
"NeverUseImplicitlyUnwrappedOptionals": false,
10+
"NoLeadingUnderscores": true,
11+
"ValidateDocumentationComments": false,
12+
},
13+
"tabWidth": 2,
14+
"version": 1,
15+
}

‎App/Generated/SwiftGen/Assets.swift

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// swiftlint:disable all
2+
// Generated using SwiftGen — https://github.com/SwiftGen/SwiftGen
3+
4+
#if os(OSX)
5+
import AppKit.NSImage
6+
#elseif os(iOS) || os(tvOS) || os(watchOS)
7+
import UIKit.UIImage
8+
#endif
9+
10+
// MARK: - Asset Catalogs
11+
12+
internal typealias Colors = Asset.Colors
13+
internal typealias Images = Asset.Images
14+
15+
internal enum Asset {
16+
internal enum Colors {
17+
internal enum Theme {
18+
internal static let accent = UIColor(named: "Theme/Accent", in: Bundle(for: BundleToken.self), compatibleWith: nil)!
19+
internal static let barBackground = UIColor(named: "Theme/BarBackground", in: Bundle(for: BundleToken.self), compatibleWith: nil)!
20+
internal static let contentBackground = UIColor(named: "Theme/ContentBackground", in: Bundle(for: BundleToken.self), compatibleWith: nil)!
21+
internal static let contentBackgroundElevated = UIColor(named: "Theme/ContentBackgroundElevated", in: Bundle(for: BundleToken.self), compatibleWith: nil)!
22+
internal static let primary = UIColor(named: "Theme/Primary", in: Bundle(for: BundleToken.self), compatibleWith: nil)!
23+
internal static let secondary = UIColor(named: "Theme/Secondary", in: Bundle(for: BundleToken.self), compatibleWith: nil)!
24+
}
25+
}
26+
internal enum Images {
27+
internal static let background = UIImage(named: "Background", in: Bundle(for: BundleToken.self), compatibleWith: nil)!
28+
internal static let logo = UIImage(named: "Logo", in: Bundle(for: BundleToken.self), compatibleWith: nil)!
29+
internal static let separatorCompact = UIImage(named: "separator-compact", in: Bundle(for: BundleToken.self), compatibleWith: nil)!
30+
internal static let separator = UIImage(named: "separator", in: Bundle(for: BundleToken.self), compatibleWith: nil)!
31+
}
32+
}
33+
34+
// MARK: - Implementation Details
35+
36+
private final class BundleToken {}

0 commit comments

Comments
 (0)