-
Notifications
You must be signed in to change notification settings - Fork 0
Sprint 17 #5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Grifon-com
wants to merge
24
commits into
main
Choose a base branch
from
sprint_17
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Sprint 17 #5
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
a21c96b
1.Добавил английскую локализацию
Grifon-com 363ca95
а
Grifon-com 2120afd
added tracker editing
Grifon-com 7b2b496
added deleting tracker via menu
Grifon-com 284fd4e
added tracker filtering
Grifon-com de236ca
add Snapshots test main screen
Grifon-com 9d6e52d
implemented dark theme for the main screen
Grifon-com 06d7cdc
add analytics
Grifon-com 3d40d24
add screen Statistics
Grifon-com 52bbdc0
add edit + delete category for menu
Grifon-com 6699f30
refactoring
Grifon-com 121bcb3
refactoring
Grifon-com aa129ef
refactoring
Grifon-com a684893
refactoring
Grifon-com aca4011
refactoring
Grifon-com 400c860
refactoring
Grifon-com dfef8ba
refactoring
Grifon-com 3b7e9d6
refactoring
Grifon-com d1174f9
refactoring by Pull Requesr
Grifon-com 2422ca3
separator setting tableView CreateTrackerViewController
Grifon-com c46fe97
correction of comments
Grifon-com a6d1907
refactoring color dark theme
Grifon-com 7698a33
refactoring filter
Grifon-com effb446
refactoring
Grifon-com File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| # Xcode | ||
| # | ||
| # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore | ||
|
|
||
| ## User settings | ||
| xcuserdata/ | ||
|
|
||
| ## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9) | ||
| *.xcscmblueprint | ||
| *.xccheckout | ||
|
|
||
| ## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4) | ||
| build/ | ||
| DerivedData/ | ||
| *.moved-aside | ||
| *.pbxuser | ||
| !default.pbxuser | ||
| *.mode1v3 | ||
| !default.mode1v3 | ||
| *.mode2v3 | ||
| !default.mode2v3 | ||
| *.perspectivev3 | ||
| !default.perspectivev3 | ||
|
|
||
| ## Obj-C/Swift specific | ||
| *.hmap | ||
|
|
||
| ## App packaging | ||
| *.ipa | ||
| *.dSYM.zip | ||
| *.dSYM | ||
|
|
||
| ## Playgrounds | ||
| timeline.xctimeline | ||
| playground.xcworkspace | ||
|
|
||
| # Swift Package Manager | ||
| # | ||
| # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. | ||
| # Packages/ | ||
| # Package.pins | ||
| # Package.resolved | ||
| # *.xcodeproj | ||
| # | ||
| # Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata | ||
| # hence it is not needed unless you have added a package configuration file to your project | ||
| # .swiftpm | ||
|
|
||
| .build/ | ||
|
|
||
| # CocoaPods | ||
| # | ||
| # We recommend against adding the Pods directory to your .gitignore. However | ||
| # you should judge for yourself, the pros and cons are mentioned at: | ||
| # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control | ||
| # | ||
| Pods/ | ||
| # | ||
| # Add this line if you want to avoid checking in source code from the Xcode workspace | ||
| # *.xcworkspace | ||
|
|
||
| # Carthage | ||
| # | ||
| # Add this line if you want to avoid checking in source code from Carthage dependencies. | ||
| # Carthage/Checkouts | ||
|
|
||
| Carthage/Build/ | ||
|
|
||
| # Accio dependency management | ||
| Dependencies/ | ||
| .accio/ | ||
|
|
||
| # fastlane | ||
| # | ||
| # It is recommended to not store the screenshots in the git repo. | ||
| # Instead, use fastlane to re-generate the screenshots whenever they are needed. | ||
| # For more information about the recommended setup visit: | ||
| # https://docs.fastlane.tools/best-practices/source-control/#source-control | ||
|
|
||
| fastlane/report.xml | ||
| fastlane/Preview.html | ||
| fastlane/screenshots/**/*.png | ||
| fastlane/test_output | ||
|
|
||
| # Code Injection | ||
| # | ||
| # After new code Injection tools there's a generated folder /iOSInjectionProject | ||
| # https://github.com/johnno1962/injectionforxcode | ||
|
|
||
| iOSInjectionProject/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| platform :ios, '13.4' | ||
|
|
||
| target 'Tracker' do | ||
| use_frameworks! | ||
|
|
||
| pod 'YandexMobileMetrica/Dynamic' | ||
|
|
||
| target 'TrackerTests' do | ||
| inherit! :search_paths | ||
| end | ||
|
|
||
| end | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| PODS: | ||
| - YandexMobileMetrica/Dynamic (4.5.2): | ||
| - YandexMobileMetrica/Dynamic/Core (= 4.5.2) | ||
| - YandexMobileMetrica/Dynamic/Crashes (= 4.5.2) | ||
| - YandexMobileMetrica/Dynamic/Core (4.5.2) | ||
| - YandexMobileMetrica/Dynamic/Crashes (4.5.2): | ||
| - YandexMobileMetrica/Dynamic/Core | ||
|
|
||
| DEPENDENCIES: | ||
| - YandexMobileMetrica/Dynamic | ||
|
|
||
| SPEC REPOS: | ||
| trunk: | ||
| - YandexMobileMetrica | ||
|
|
||
| SPEC CHECKSUMS: | ||
| YandexMobileMetrica: f5368ee93f286c793d73b58da00929babfc897c1 | ||
|
|
||
| PODFILE CHECKSUM: 134a89b347022b6f71780478cfaefa2eefbc0db9 | ||
|
|
||
| COCOAPODS: 1.14.3 |
Large diffs are not rendered by default.
Oops, something went wrong.
23 changes: 23 additions & 0 deletions
23
Tracker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <Scheme | ||
| LastUpgradeVersion = "1430" | ||
| version = "1.7"> | ||
| <BuildAction | ||
| parallelizeBuildables = "YES" | ||
| buildImplicitDependencies = "YES"> | ||
| <BuildActionEntries> | ||
| <BuildActionEntry | ||
| buildForTesting = "YES" | ||
| buildForRunning = "YES" | ||
| buildForProfiling = "YES" | ||
| buildForArchiving = "YES" | ||
| buildForAnalyzing = "YES"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "1A8A7FE12AC55D960038CB42" | ||
| BuildableName = "Tracker.app" | ||
| BlueprintName = "Tracker" | ||
| ReferencedContainer = "container:Tracker.xcodeproj"> | ||
| </BuildableReference> | ||
| </BuildActionEntry> | ||
| </BuildActionEntries> | ||
| </BuildAction> | ||
| <TestAction | ||
| buildConfiguration = "Debug" | ||
| selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" | ||
| selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" | ||
| shouldUseLaunchSchemeArgsEnv = "YES" | ||
| shouldAutocreateTestPlan = "YES"> | ||
| <Testables> | ||
| <TestableReference | ||
| skipped = "NO" | ||
| parallelizable = "YES"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "1AE96E1F2B3424E40061F10D" | ||
| BuildableName = "TrackerTests.xctest" | ||
| BlueprintName = "TrackerTests" | ||
| ReferencedContainer = "container:Tracker.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 = "1A8A7FE12AC55D960038CB42" | ||
| BuildableName = "Tracker.app" | ||
| BlueprintName = "Tracker" | ||
| ReferencedContainer = "container:Tracker.xcodeproj"> | ||
| </BuildableReference> | ||
| </BuildableProductRunnable> | ||
| </LaunchAction> | ||
| <ProfileAction | ||
| buildConfiguration = "Release" | ||
| shouldUseLaunchSchemeArgsEnv = "YES" | ||
| savedToolIdentifier = "" | ||
| useCustomWorkingDirectory = "NO" | ||
| debugDocumentVersioning = "YES"> | ||
| <BuildableProductRunnable | ||
| runnableDebuggingMode = "0"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "1A8A7FE12AC55D960038CB42" | ||
| BuildableName = "Tracker.app" | ||
| BlueprintName = "Tracker" | ||
| ReferencedContainer = "container:Tracker.xcodeproj"> | ||
| </BuildableReference> | ||
| </BuildableProductRunnable> | ||
| </ProfileAction> | ||
| <AnalyzeAction | ||
| buildConfiguration = "Debug"> | ||
| </AnalyzeAction> | ||
| <ArchiveAction | ||
| buildConfiguration = "Release" | ||
| revealArchiveInOrganizer = "YES"> | ||
| </ArchiveAction> | ||
| </Scheme> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Перепроверь как оформлен файл, кажется что из-за этого ошибка