-
Notifications
You must be signed in to change notification settings - Fork 0
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
Правки по спринту 14 #1
Merged
Merged
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit
Hold shift + click to select a range
47fd398
Верстка LaunchScreen и экранов Трекер и Статистика
freeagles1991 fe76cfb
Добавил экраны для создания трекера
freeagles1991 9b8f1fd
Добавил экран с выбором расписания
freeagles1991 c5d06f4
Сохраняем выбранные дни недели
freeagles1991 1feecb3
Добавил UIDatePicker и заголовок
freeagles1991 7a97082
Сверстал ячейку для UICollectionView
freeagles1991 94c9da5
Настроил отображение UISearchBar
freeagles1991 d57422c
Добавил категории для ячеек
freeagles1991 19c9774
Правки по верстке экрана трекеров
freeagles1991 b1fe019
Добавил экраны для добавления категорий и сервис хранения трекеров
freeagles1991 075ddc8
Добавил таблицу на экран выбора категории
freeagles1991 489e063
Добавил сохранение созданных категорий в DataService
freeagles1991 a148204
Добавил отображение выбранной категории на кнопку
freeagles1991 ad0ad87
Добавил отображение выбранных дней недели в кнопке
freeagles1991 4762815
Добавил кнопки Отмена и Создать на экране создания трекера
freeagles1991 9777283
Правки верстки экрана создания нового трекера
freeagles1991 fb450eb
Сделал сохранение новых трекеров в сервис
freeagles1991 2505173
Отображение созданных трекеров из сервиса
freeagles1991 8155b22
Добавил фильтрацию трекеров по выбранной дате
freeagles1991 35c2e19
Добавил логику увеличения/уменьшения каунтера для трекера и проверку …
freeagles1991 47b2c42
Добавил записи в TrackerDataService
freeagles1991 17e6a35
Настройка отображения данных в ячейке
freeagles1991 acab97c
Трекер отображается сразу в выбранный день после добавления
freeagles1991 3a48254
Динамический размер ячеек в коллекции
freeagles1991 750040c
Добавил изменение состояния кнопки при создании трекера
freeagles1991 a4d67af
Почистил ненужные комментарии
freeagles1991 cd52f6c
Перенес хранение в TrackersVC
freeagles1991 c45b19d
Добавил склонение День для разного кол-ва выполненных дней
freeagles1991 c608ab7
Добавил бордер к TabBar и увеличил высоту
freeagles1991 9a68498
Исправил использование шрифтов
freeagles1991 9bb8c2c
Переименовал цвет и изменил цвет свичей в расписании
freeagles1991 a402ebf
Изменил цвет кнопок
freeagles1991 b8b0c48
Изменил логику выполнения трекера по выбранным дням
freeagles1991 7a59a97
Исправил верстку кнопки ячейки
freeagles1991 5d42b43
Скрываем клавиатуру при тапе на область экрана
freeagles1991 e601f9a
Добавил создание нерегулярных событий
freeagles1991 1b2e985
Переименовал контроллеры
freeagles1991 5fde007
Добавил подложку для эмоджи, динамическая верстка элементов ячейки
freeagles1991 b3e28a9
Верстка заголовка секции
freeagles1991 5932792
Указал final для классов
freeagles1991 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
Добавил экран с выбором расписания
- Loading branch information
commit 9b8f1fd87d4a303abe1d9a3f564ab18ecbb3b7ce
There are no files selected for viewing
This file contains 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
This file contains 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,38 @@ | ||
{ | ||
"colors" : [ | ||
{ | ||
"color" : { | ||
"color-space" : "srgb", | ||
"components" : { | ||
"alpha" : "1.000", | ||
"blue" : "0xEB", | ||
"green" : "0xE8", | ||
"red" : "0xE6" | ||
} | ||
}, | ||
"idiom" : "universal" | ||
}, | ||
{ | ||
"appearances" : [ | ||
{ | ||
"appearance" : "luminosity", | ||
"value" : "dark" | ||
} | ||
], | ||
"color" : { | ||
"color-space" : "srgb", | ||
"components" : { | ||
"alpha" : "1.000", | ||
"blue" : "0xFF", | ||
"green" : "0xFF", | ||
"red" : "0xFE" | ||
} | ||
}, | ||
"idiom" : "universal" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
This file contains 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
This file contains 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
This file contains 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
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.
лучше вынести в отдельный файл