Skip to content

Commit 1fc6730

Browse files
Merge pull request #3 from htmlprogrammist/develop
3.0.3
2 parents 51ccb94 + 2c24f6b commit 1fc6730

61 files changed

Lines changed: 320 additions & 269 deletions

File tree

Some content is hidden

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

CONTRIBUTING.md

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,59 @@ Here you find all which using in project:
2828
- // MARK: - Private Methods
2929
- // MARK: - Ovveride
3030
- // MARK: - Layout
31-
- // MARK: - Models
3231

3332
If you can't find valid, add new to codestyle agreements please. Other can be use if class is large and need struct it even without adding to codestyle agreements.
33+
34+
## Conventional Commits
35+
36+
- Commit names should be according to the [guideline](https://github.com/htmlprogrammist/EmojiPicker/blob/main/CONTRIBUTING.md#guideline)
37+
- The present tense should be used ("add function", not "added function")
38+
- The imperative mood should be used ("move the cursor to...", not "move the cursor to...")
39+
40+
### Guideline
41+
42+
- `init:` - used to start a project or task. Examples:
43+
44+
```
45+
init: start youtube-task
46+
init: start mentor-dashboard task
47+
```
48+
49+
- `feat:` - describes implementing new functionality from the terms of reference (added zoom support, added footer, added a product card). Examples:
50+
51+
```
52+
feat: add basic page layout
53+
feat: implement search box
54+
feat: implement request to youtube API
55+
feat: implement swipe for horizontal list
56+
feat: add additional navigation button
57+
feat: add banner
58+
feat: add social links
59+
feat: add physical security section
60+
feat: add real social icons
61+
```
62+
63+
- `fix:` - describes fixing a bug in previously implemented functionality. Examples:
64+
65+
```
66+
fix: implement correct loading data from youtube
67+
fix: change layout for video items to fix bugs
68+
fix: relayout header for firefox
69+
fix: adjust social links for mobile
70+
```
71+
72+
- `refactor:` - I didn't add any new functionality/didn't change the behavior. I put the files in other places, deleted them, added them. Changed the formatting of the code (white-space, formatting, missing semi-columns, etc). Improved the algorithm, without changing the functionality. Examples:
73+
74+
```
75+
refactor: change structure of the project
76+
refactor: rename vars for better readability
77+
refactor: apply eslint
78+
refactor: apply prettier
79+
```
80+
81+
- `docs:` - used when working with the documentation/README of the project. Examples:
82+
83+
```
84+
docs: update readme with additional information
85+
docs: update description of run() method
86+
```

EmojiPicker.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'EmojiPicker'
3-
s.version = '3.0.2'
3+
s.version = '3.0.3'
44
s.license = 'MIT'
55
s.summary = 'Emoji picker for iOS like on MacOS'
66
s.homepage = 'https://github.com/htmlprogrammist/EmojiPicker'
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
1111
s.resource_bundle = { "EmojiPicker" => ["Sources/EmojiPicker/**/*.lproj/*.{strings}"] }
1212

1313
s.test_spec 'Tests' do |test_spec|
14-
test_spec.source_files = 'Tests/**/*.{swift}'
14+
test_spec.source_files = 'Tests/EmojiPickerTests/**/*.{swift}'
1515
end
1616

1717
s.swift_version = '4.2'

Example/EmojiPicker.xcodeproj/project.pbxproj renamed to Example App/EmojiPicker.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
/* Begin PBXFileReference section */
1818
028AB9FF7F7146CA02C6047E /* Pods-EmojiPicker_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EmojiPicker_Example.debug.xcconfig"; path = "Target Support Files/Pods-EmojiPicker_Example/Pods-EmojiPicker_Example.debug.xcconfig"; sourceTree = "<group>"; };
19-
39C5556144E64B4781AC3E2C /* EmojiPicker.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = EmojiPicker.podspec; path = ../EmojiPicker.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
19+
39C5556144E64B4781AC3E2C /* EmojiPicker.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = EmojiPicker.podspec; path = ../EmojiPicker.podspec; sourceTree = "<group>"; };
2020
4E7BA306C8344910609AD79B /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
2121
52C75966261C87A105AE3101 /* Pods_EmojiPicker_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_EmojiPicker_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2222
607FACD01AFB9204008FA782 /* EmojiPicker_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EmojiPicker_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };

Example/EmojiPicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to Example App/EmojiPicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata

File renamed without changes.

Example/EmojiPicker.xcodeproj/xcshareddata/xcschemes/EmojiPicker-Example.xcscheme renamed to Example App/EmojiPicker.xcodeproj/xcshareddata/xcschemes/EmojiPicker-Example.xcscheme

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
language = "en">
3031
<MacroExpansion>
3132
<BuildableReference
3233
BuildableIdentifier = "primary"

Example/EmojiPicker.xcodeproj/xcuserdata/egbad.xcuserdatad/xcschemes/xcschememanagement.plist renamed to Example App/EmojiPicker.xcodeproj/xcuserdata/egbad.xcuserdatad/xcschemes/xcschememanagement.plist

File renamed without changes.

Example/EmojiPicker.xcworkspace/contents.xcworkspacedata renamed to Example App/EmojiPicker.xcworkspace/contents.xcworkspacedata

File renamed without changes.

Example/EmojiPicker.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist renamed to Example App/EmojiPicker.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

File renamed without changes.
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// AppDelegate.swift
33
// EmojiPicker
44
//
5-
// Created by htmlprogrammist on 01/14/2023.
6-
// Copyright (c) 2023 htmlprogrammist. All rights reserved.
5+
// Created by Егор Бадмаев on 14.01.2023.
6+
// Copyright (c) 2023 Егор Бадмаев. All rights reserved.
77
//
88

99
import UIKit

0 commit comments

Comments
 (0)