Skip to content

Commit f603ceb

Browse files
committed
Merge branch 'develop' into feature/#575_push_notification
# Conflicts: # Commun/Controllers/CommunityPageVC/CommunityPageVC.swift # Commun/Controllers/ProfilePageVC/MyProfilePageVC/MyProfilePageVC.swift # cyberSwift
2 parents 148da13 + 1b25b52 commit f603ceb

File tree

77 files changed

+2562
-497
lines changed

Some content is hidden

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

77 files changed

+2562
-497
lines changed

.swiftlint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
warning_threshold: 200
1+
warning_threshold: 1000
22

33
excluded:
44
- Pods
@@ -12,14 +12,15 @@ disabled_rules:
1212
- force_cast
1313
- function_body_length
1414
- line_length
15-
- type_body_length
15+
- type_body_lengt10
1616
- multiple_closures_with_trailing_closure
1717
- redundant_string_enum_value
1818
- inert_defer
1919
- nesting
2020
- type_name
2121
- file_length
2222
- opening_brace
23+
- shorthand_operator
2324

2425
line_length:
2526
warning: 250
@@ -34,4 +35,3 @@ file_length:
3435

3536
type_body_length:
3637
warning: 400
37-
error: 450

Commun.xcodeproj/project.pbxproj

Lines changed: 196 additions & 128 deletions
Large diffs are not rendered by default.

Commun.xcodeproj/xcshareddata/xcschemes/Commun.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<EnvironmentVariables>
102102
<EnvironmentVariable
103103
key = "OS_ACTIVITY_MODE"
104-
value = "disable"
104+
value = "enable"
105105
isEnabled = "YES">
106106
</EnvironmentVariable>
107107
</EnvironmentVariables>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "More Center.pdf"
6+
}
7+
],
8+
"info" : {
9+
"version" : 1,
10+
"author" : "xcode"
11+
},
12+
"properties" : {
13+
"template-rendering-intent" : "template"
14+
}
15+
}

Commun/Assets.xcassets/image pdf/icon-post-cell-more-center-default.imageset/icon-post-cell-more-center-default.pdf renamed to Commun/Assets.xcassets/icon-post-cell-more-center-default.imageset/More Center.pdf

1.32 KB
Binary file not shown.

Commun/Assets.xcassets/image pdf/icon-post-cell-more-center-default.imageset/Contents.json renamed to Commun/Assets.xcassets/image pdf/icon-cancel-grey-cyrcle-default.imageset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"images" : [
33
{
44
"idiom" : "universal",
5-
"filename" : "icon-post-cell-more-center-default.pdf"
5+
"filename" : "icon-cancel-grey-cyrcle-default.pdf"
66
}
77
],
88
"info" : {
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "icon-checkmark-white.pdf"
6+
}
7+
],
8+
"info" : {
9+
"version" : 1,
10+
"author" : "xcode"
11+
}
12+
}
Binary file not shown.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "icon-face-id-grey-default.pdf"
6+
}
7+
],
8+
"info" : {
9+
"version" : 1,
10+
"author" : "xcode"
11+
}
12+
}

0 commit comments

Comments
 (0)