From 5a966e9d9d90f03addd1ac6d38e51f6eefb011e4 Mon Sep 17 00:00:00 2001
From: acclorite <acclorite@gmail.com>
Date: Mon, 4 Mar 2024 19:12:00 +0200
Subject: [PATCH] 0.8.0 - History Screen and Project Name change

---
 .idea/.name                                   |   2 +-
 .idea/deploymentTargetDropDown.xml            |  11 +-
 .idea/gradle.xml                              |   2 +-
 .idea/vcs.xml                                 |   2 +-
 app/build.gradle.kts                          |   9 +-
 .../books_history/ExampleInstrumentedTest.kt  |  22 -
 app/src/main/AndroidManifest.xml              |  13 +-
 app/src/main/app_icon-playstore.png           | Bin 26137 -> 0 bytes
 app/src/main/app_icon_mc-playstore.png        | Bin 15716 -> 0 bytes
 .../main/app_icon_monochromed-playstore.png   | Bin 11549 -> 0 bytes
 app/src/main/deleteme-playstore.png           | Bin 7936 -> 0 bytes
 .../books_history/data/di/RepositoryModule.kt |  35 -
 .../data/local/room/BookDatabase.kt           |  14 -
 .../books_history/data/mapper/BookMapper.kt   |  10 -
 .../books_history/data/parser/FileParser.kt   |   9 -
 .../books_history/data/parser/TextParser.kt   |   8 -
 .../domain/use_case/DeleteBooks.kt            |  12 -
 .../components/AnimatedTopAppBar.kt           | 128 ---
 .../screens/history/HistoryScreen.kt          |  16 -
 .../screens/history/data/HistoryEvent.kt      |   3 -
 .../screens/history/data/HistoryState.kt      |   5 -
 .../screens/history/data/HistoryViewModel.kt  |  36 -
 .../ReaderSettingsBottomSheetItem.kt          |  50 --
 .../settings/components/SettingsOptionItem.kt |  50 --
 .../acclorite/book_story}/MainActivity.kt     |  65 +-
 .../book_story}/data/di/AppModule.kt          |   6 +-
 .../book_story/data/di/RepositoryModule.kt    |  43 +
 .../data/local/data_store/DataStore.kt        |   2 +-
 .../data/local/data_store/DataStoreImpl.kt    |   2 +-
 .../book_story}/data/local/dto/BookEntity.kt  |   4 +-
 .../data/local/dto/HistoryEntity.kt           |  12 +
 .../book_story}/data/local/room/BookDao.kt    |  23 +-
 .../data/local/room/BookDatabase.kt           |  18 +
 .../book_story/data/mapper/BookMapper.kt      |  10 +
 .../book_story}/data/mapper/BookMapperImpl.kt |  16 +-
 .../book_story/data/mapper/HistoryMapper.kt   |  11 +
 .../data/mapper/HistoryMapperImpl.kt          |  24 +
 .../book_story}/data/parser/EpubFileParser.kt |  14 +-
 .../book_story}/data/parser/EpubTextParser.kt |  14 +-
 .../book_story/data/parser/FileParser.kt      |   9 +
 .../book_story}/data/parser/PdfFileParser.kt  |  12 +-
 .../book_story}/data/parser/PdfTextParser.kt  |   4 +-
 .../book_story/data/parser/TextParser.kt      |   8 +
 .../book_story}/data/parser/TxtFileParser.kt  |  12 +-
 .../book_story}/data/parser/TxtTextParser.kt  |  16 +-
 .../data/repository/BookRepositoryImpl.kt     |  70 +-
 .../book_story}/domain/model/Book.kt          |  42 +-
 .../book_story}/domain/model/Category.kt      |   2 +-
 .../book_story}/domain/model/ChipItem.kt      |   2 +-
 .../book_story}/domain/model/FontWithName.kt  |   4 +-
 .../book_story/domain/model/GroupedHistory.kt |   9 +
 .../book_story/domain/model/History.kt        |  10 +
 .../domain/model/NavigationBarItem.kt         |   2 +-
 .../book_story}/domain/model/NullableBook.kt  |   2 +-
 .../book_story}/domain/model/StringWithId.kt  |  26 +-
 .../domain/repository/BookRepository.kt       |  26 +-
 .../domain/use_case/ChangeLanguage.kt         |   8 +-
 .../book_story/domain/use_case/DeleteBooks.kt |  17 +
 .../domain/use_case/DeleteHistory.kt          |  12 +
 .../domain/use_case/DeleteWholeHistory.kt     |  11 +
 .../domain/use_case/FastGetBooks.kt           |   6 +-
 .../book_story}/domain/use_case/GetBooks.kt   |   8 +-
 .../domain/use_case/GetBooksFromFiles.kt      |   8 +-
 .../domain/use_case/GetDatastore.kt           |   4 +-
 .../domain/use_case/GetFilesFromDownloads.kt  |   6 +-
 .../book_story/domain/use_case/GetHistory.kt  |  14 +
 .../book_story}/domain/use_case/GetText.kt    |   8 +-
 .../domain/use_case/InsertBooks.kt            |   6 +-
 .../domain/use_case/InsertHistory.kt          |  11 +
 .../domain/use_case/SetDatastore.kt           |   4 +-
 .../domain/use_case/UpdateBooks.kt            |   6 +-
 .../book_story}/presentation/Navigation.kt    |   8 +-
 .../components/AnimatedTopAppBar.kt           | 141 ++++
 .../components/BottomNavigationBar.kt         |  27 +-
 .../components/BottomNavigationItem.kt        |   4 +-
 .../presentation/components/CategoryTitle.kt  |   2 +-
 .../presentation/components/CustomCheckbox.kt |   4 +-
 .../components/CustomDialogWithContent.kt     |  10 +-
 .../components/CustomDialogWithLazyColumn.kt  |  10 +-
 .../components/CustomDropDownMenuItem.kt      |   2 +-
 .../presentation/components/CustomSnackBar.kt |  49 ++
 .../presentation/components/IsEmpty.kt        |   2 +-
 .../presentation/components/IsError.kt        |   2 +-
 .../presentation/components/MoreDropDown.kt   |   8 +-
 .../components/SelectableDialogItem.kt        |   2 +-
 .../presentation/data/ArithmeticOperations.kt |   2 +-
 .../presentation/data/MainEvent.kt            |   2 +-
 .../presentation/data/MainViewModel.kt        |  20 +-
 .../screens/book_info/BookInfoScreen.kt       |  78 +-
 .../components/BookInfoBackground.kt          |   2 +-
 .../BookInfoChangeCoverBottomSheet.kt         |  21 +-
 .../BookInfoChangeCoverBottomSheetItem.kt     |   2 +-
 .../components/BookInfoDeleteDialog.kt        |  28 +-
 .../components/BookInfoDescriptionSection.kt  |   6 +-
 .../components/BookInfoDetailsBottomSheet.kt  |  12 +-
 .../BookInfoDetailsBottomSheetItem.kt         |   2 +-
 .../components/BookInfoInfoSection.kt         |  12 +-
 .../components/BookInfoMoreDropDown.kt        |  10 +-
 .../components/BookInfoMoveDialog.kt          |  20 +-
 .../components/BookInfoStatisticSection.kt    |  10 +-
 .../screens/book_info/data/BookInfoEvent.kt   |   6 +-
 .../screens/book_info/data/BookInfoState.kt   |   6 +-
 .../book_info/data/BookInfoViewModel.kt       |  20 +-
 .../screens/browse/BrowseScreen.kt            |  53 +-
 .../browse/components/BrowseAddingDialog.kt   | 176 ++--
 .../components/BrowseAddingDialogItem.kt      |   6 +-
 .../browse/components/BrowseFIleItem.kt       | 292 +++----
 .../BrowseStoragePermissionDialog.kt          |  78 +-
 .../screens/browse/data/BrowseEvent.kt        |  71 +-
 .../screens/browse/data/BrowseState.kt        |  54 +-
 .../screens/browse/data/BrowseViewModel.kt    | 769 +++++++++---------
 .../screens/history/HistoryScreen.kt          | 348 ++++++++
 .../HistoryDeleteWholeHistoryDialog.kt        |  41 +
 .../screens/history/components/HistoryItem.kt | 138 ++++
 .../screens/history/data/HistoryEvent.kt      |  24 +
 .../screens/history/data/HistoryState.kt      |  19 +
 .../screens/history/data/HistoryViewModel.kt  | 294 +++++++
 .../screens/library/LibraryScreen.kt          |  54 +-
 .../library/components/LibraryBookItem.kt     |  10 +-
 .../library/components/LibraryDeleteDialog.kt |  27 +-
 .../library/components/LibraryMoveDialog.kt   |  14 +-
 .../library/components/LibraryTabRow.kt       |  14 +-
 .../screens/library/data/LibraryEvent.kt      |   8 +-
 .../screens/library/data/LibraryState.kt      |   6 +-
 .../screens/library/data/LibraryViewModel.kt  |  25 +-
 .../screens/reader/ReaderScreen.kt            |  42 +-
 .../reader/components/ReaderBottomBar.kt      |  16 +-
 .../reader/components/ReaderEndItem.kt        |  18 +-
 .../components/ReaderSettingsBottomSheet.kt   |  34 +-
 .../ReaderSettingsBottomSheetTabRow.kt        |   8 +-
 .../reader/components/ReaderStartItem.kt      |   8 +-
 .../screens/reader/components/ReaderTopBar.kt |  18 +-
 .../screens/reader/data/ReaderEvent.kt        |   6 +-
 .../screens/reader/data/ReaderState.kt        |   6 +-
 .../screens/reader/data/ReaderViewModel.kt    |  43 +-
 .../screens/settings/SettingsScreen.kt        |  44 +-
 .../settings/components/CheckboxWIthTitle.kt  |   4 +-
 .../settings/components/ChipsWithTitle.kt     |   6 +-
 .../components/ColorPickerWithTitle.kt        |   6 +-
 .../components/SettingsCategoryItem.kt        |   2 +-
 .../settings/components/SliderWithTitle.kt    |   4 +-
 .../nested/appearance/AppearanceSettings.kt   |  55 +-
 .../AppearanceSettingsThemeSwitcher.kt        |  16 +-
 .../AppearanceSettingsThemeSwitcherItem.kt    |   8 +-
 .../nested/general/GeneralSettings.kt         |  55 +-
 .../acclorite/book_story}/ui/Color.kt         |  26 +-
 .../acclorite/book_story}/ui/Elevation.kt     |   2 +-
 .../acclorite/book_story}/ui/Theme.kt         |   2 +-
 .../acclorite/book_story}/ui/Transitions.kt   |  14 +-
 .../acclorite/book_story}/ui/Typography.kt    |   2 +-
 .../book_story/ui/theme/AquaTheme.kt          | 136 ++++
 .../book_story}/ui/theme/BlueTheme.kt         |   2 +-
 .../book_story}/ui/theme/GreenTheme.kt        |   2 +-
 .../book_story}/ui/theme/PinkTheme.kt         |   2 +-
 .../book_story}/ui/theme/PurpleTheme.kt       |   2 +-
 .../book_story}/ui/theme/RedTheme.kt          |   2 +-
 .../book_story}/ui/theme/YellowTheme.kt       |   2 +-
 .../book_story}/util/BookApplication.kt       |   2 +-
 .../acclorite/book_story}/util/Constants.kt   |  19 +-
 .../book_story}/util/DataStoreConstants.kt    |   2 +-
 .../acclorite/book_story}/util/Resource.kt    |   2 +-
 .../acclorite/book_story}/util/UIText.kt      |   2 +-
 .../app_icon.xml                              |   0
 .../app_icon_round.xml                        |   0
 app/src/main/res/values-uk/strings.xml        |  27 +-
 app/src/main/res/values/strings.xml           |  30 +-
 app/src/main/res/values/themes.xml            |   2 +-
 .../books_history/ExampleUnitTest.kt          |  16 -
 app/strings.xml                               |  67 --
 gradle.properties                             |   3 +-
 settings.gradle.kts                           |   2 +-
 171 files changed, 3027 insertions(+), 1877 deletions(-)
 delete mode 100644 app/src/androidTest/java/com/acclorite/books_history/ExampleInstrumentedTest.kt
 delete mode 100644 app/src/main/app_icon-playstore.png
 delete mode 100644 app/src/main/app_icon_mc-playstore.png
 delete mode 100644 app/src/main/app_icon_monochromed-playstore.png
 delete mode 100644 app/src/main/deleteme-playstore.png
 delete mode 100644 app/src/main/java/com/acclorite/books_history/data/di/RepositoryModule.kt
 delete mode 100644 app/src/main/java/com/acclorite/books_history/data/local/room/BookDatabase.kt
 delete mode 100644 app/src/main/java/com/acclorite/books_history/data/mapper/BookMapper.kt
 delete mode 100644 app/src/main/java/com/acclorite/books_history/data/parser/FileParser.kt
 delete mode 100644 app/src/main/java/com/acclorite/books_history/data/parser/TextParser.kt
 delete mode 100644 app/src/main/java/com/acclorite/books_history/domain/use_case/DeleteBooks.kt
 delete mode 100644 app/src/main/java/com/acclorite/books_history/presentation/components/AnimatedTopAppBar.kt
 delete mode 100644 app/src/main/java/com/acclorite/books_history/presentation/screens/history/HistoryScreen.kt
 delete mode 100644 app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryEvent.kt
 delete mode 100644 app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryState.kt
 delete mode 100644 app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryViewModel.kt
 delete mode 100644 app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheetItem.kt
 delete mode 100644 app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SettingsOptionItem.kt
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/MainActivity.kt (76%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/data/di/AppModule.kt (75%)
 create mode 100644 app/src/main/java/ua/acclorite/book_story/data/di/RepositoryModule.kt
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/data/local/data_store/DataStore.kt (81%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/data/local/data_store/DataStoreImpl.kt (95%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/data/local/dto/BookEntity.kt (85%)
 create mode 100644 app/src/main/java/ua/acclorite/book_story/data/local/dto/HistoryEntity.kt
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/data/local/room/BookDao.kt (54%)
 create mode 100644 app/src/main/java/ua/acclorite/book_story/data/local/room/BookDatabase.kt
 create mode 100644 app/src/main/java/ua/acclorite/book_story/data/mapper/BookMapper.kt
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/data/mapper/BookMapperImpl.kt (85%)
 create mode 100644 app/src/main/java/ua/acclorite/book_story/data/mapper/HistoryMapper.kt
 create mode 100644 app/src/main/java/ua/acclorite/book_story/data/mapper/HistoryMapperImpl.kt
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/data/parser/EpubFileParser.kt (79%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/data/parser/EpubTextParser.kt (74%)
 create mode 100644 app/src/main/java/ua/acclorite/book_story/data/parser/FileParser.kt
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/data/parser/PdfFileParser.kt (82%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/data/parser/PdfTextParser.kt (94%)
 create mode 100644 app/src/main/java/ua/acclorite/book_story/data/parser/TextParser.kt
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/data/parser/TxtFileParser.kt (75%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/data/parser/TxtTextParser.kt (55%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/data/repository/BookRepositoryImpl.kt (76%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/domain/model/Book.kt (78%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/domain/model/Category.kt (58%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/domain/model/ChipItem.kt (81%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/domain/model/FontWithName.kt (67%)
 create mode 100644 app/src/main/java/ua/acclorite/book_story/domain/model/GroupedHistory.kt
 create mode 100644 app/src/main/java/ua/acclorite/book_story/domain/model/History.kt
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/domain/model/NavigationBarItem.kt (82%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/domain/model/NullableBook.kt (81%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/domain/model/StringWithId.kt (80%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/domain/repository/BookRepository.kt (61%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/domain/use_case/ChangeLanguage.kt (74%)
 create mode 100644 app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteBooks.kt
 create mode 100644 app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteHistory.kt
 create mode 100644 app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteWholeHistory.kt
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/domain/use_case/FastGetBooks.kt (55%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/domain/use_case/GetBooks.kt (54%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/domain/use_case/GetBooksFromFiles.kt (57%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/domain/use_case/GetDatastore.kt (75%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/domain/use_case/GetFilesFromDownloads.kt (64%)
 create mode 100644 app/src/main/java/ua/acclorite/book_story/domain/use_case/GetHistory.kt
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/domain/use_case/GetText.kt (56%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/domain/use_case/InsertBooks.kt (53%)
 create mode 100644 app/src/main/java/ua/acclorite/book_story/domain/use_case/InsertHistory.kt
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/domain/use_case/SetDatastore.kt (70%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/domain/use_case/UpdateBooks.kt (53%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/Navigation.kt (96%)
 create mode 100644 app/src/main/java/ua/acclorite/book_story/presentation/components/AnimatedTopAppBar.kt
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/components/BottomNavigationBar.kt (70%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/components/BottomNavigationItem.kt (93%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/components/CategoryTitle.kt (94%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/components/CustomCheckbox.kt (92%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/components/CustomDialogWithContent.kt (95%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/components/CustomDialogWithLazyColumn.kt (95%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/components/CustomDropDownMenuItem.kt (95%)
 create mode 100644 app/src/main/java/ua/acclorite/book_story/presentation/components/CustomSnackBar.kt
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/components/IsEmpty.kt (97%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/components/IsError.kt (97%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/components/MoreDropDown.kt (94%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/components/SelectableDialogItem.kt (96%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/data/ArithmeticOperations.kt (83%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/data/MainEvent.kt (94%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/data/MainViewModel.kt (96%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/book_info/BookInfoScreen.kt (81%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/book_info/components/BookInfoBackground.kt (94%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheet.kt (80%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheetItem.kt (96%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/book_info/components/BookInfoDeleteDialog.kt (52%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/book_info/components/BookInfoDescriptionSection.kt (85%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/book_info/components/BookInfoDetailsBottomSheet.kt (92%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/book_info/components/BookInfoDetailsBottomSheetItem.kt (96%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/book_info/components/BookInfoInfoSection.kt (94%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/book_info/components/BookInfoMoreDropDown.kt (87%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/book_info/components/BookInfoMoveDialog.kt (78%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/book_info/components/BookInfoStatisticSection.kt (87%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/book_info/data/BookInfoEvent.kt (88%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/book_info/data/BookInfoState.kt (73%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/book_info/data/BookInfoViewModel.kt (93%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/browse/BrowseScreen.kt (90%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/browse/components/BrowseAddingDialog.kt (81%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/browse/components/BrowseAddingDialogItem.kt (93%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/browse/components/BrowseFIleItem.kt (94%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/browse/components/BrowseStoragePermissionDialog.kt (78%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/browse/data/BrowseEvent.kt (87%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/browse/data/BrowseState.kt (82%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/browse/data/BrowseViewModel.kt (91%)
 create mode 100644 app/src/main/java/ua/acclorite/book_story/presentation/screens/history/HistoryScreen.kt
 create mode 100644 app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryDeleteWholeHistoryDialog.kt
 create mode 100644 app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryItem.kt
 create mode 100644 app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryEvent.kt
 create mode 100644 app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryState.kt
 create mode 100644 app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryViewModel.kt
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/library/LibraryScreen.kt (91%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/library/components/LibraryBookItem.kt (95%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/library/components/LibraryDeleteDialog.kt (52%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/library/components/LibraryMoveDialog.kt (81%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/library/components/LibraryTabRow.kt (94%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/library/data/LibraryEvent.kt (83%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/library/data/LibraryState.kt (77%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/library/data/LibraryViewModel.kt (93%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/reader/ReaderScreen.kt (88%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/reader/components/ReaderBottomBar.kt (84%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/reader/components/ReaderEndItem.kt (86%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/reader/components/ReaderSettingsBottomSheet.kt (90%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/reader/components/ReaderSettingsBottomSheetTabRow.kt (90%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/reader/components/ReaderStartItem.kt (94%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/reader/components/ReaderTopBar.kt (88%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/reader/data/ReaderEvent.kt (88%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/reader/data/ReaderState.kt (60%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/reader/data/ReaderViewModel.kt (89%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/settings/SettingsScreen.kt (82%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/settings/components/CheckboxWIthTitle.kt (88%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/settings/components/ChipsWithTitle.kt (93%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/settings/components/ColorPickerWithTitle.kt (95%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/settings/components/SettingsCategoryItem.kt (96%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/settings/components/SliderWithTitle.kt (95%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/settings/nested/appearance/AppearanceSettings.kt (77%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcher.kt (81%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcherItem.kt (95%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/presentation/screens/settings/nested/general/GeneralSettings.kt (77%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/ui/Color.kt (77%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/ui/Elevation.kt (74%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/ui/Theme.kt (98%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/ui/Transitions.kt (75%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/ui/Typography.kt (97%)
 create mode 100644 app/src/main/java/ua/acclorite/book_story/ui/theme/AquaTheme.kt
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/ui/theme/BlueTheme.kt (99%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/ui/theme/GreenTheme.kt (99%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/ui/theme/PinkTheme.kt (99%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/ui/theme/PurpleTheme.kt (99%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/ui/theme/RedTheme.kt (99%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/ui/theme/YellowTheme.kt (99%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/util/BookApplication.kt (75%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/util/Constants.kt (95%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/util/DataStoreConstants.kt (95%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/util/Resource.kt (87%)
 rename app/src/main/java/{com/acclorite/books_history => ua/acclorite/book_story}/util/UIText.kt (94%)
 rename app/src/main/res/{mipmap-anydpi-v26 => mipmap-anydpi}/app_icon.xml (100%)
 rename app/src/main/res/{mipmap-anydpi-v26 => mipmap-anydpi}/app_icon_round.xml (100%)
 delete mode 100644 app/src/test/java/com/acclorite/books_history/ExampleUnitTest.kt
 delete mode 100644 app/strings.xml

diff --git a/.idea/.name b/.idea/.name
index 16bd2628..1d185db5 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-Book's History Resurrection
\ No newline at end of file
+Book's Story
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 5679c4ab..bfc6f1c8 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -4,19 +4,18 @@
     <value>
       <entry key="app">
         <State>
-          <runningDeviceTargetSelectedWithDropDown>
+          <targetSelectedWithDropDown>
             <Target>
-              <type value="RUNNING_DEVICE_TARGET" />
+              <type value="QUICK_BOOT_TARGET" />
               <deviceKey>
                 <Key>
                   <type value="VIRTUAL_DEVICE_PATH" />
-                  <value value="$USER_HOME$/.android/avd/Phone_13_.avd" />
+                  <value value="C:\Users\Administrator\.android\avd\Phone_33_.avd" />
                 </Key>
               </deviceKey>
             </Target>
-          </runningDeviceTargetSelectedWithDropDown>
-          <timeTargetWasSelectedWithDropDown value="2024-02-22T17:49:53.931710327Z" />
-          <multipleDevicesSelectedInDropDown value="true" />
+          </targetSelectedWithDropDown>
+          <timeTargetWasSelectedWithDropDown value="2024-02-29T15:05:04.852701900Z" />
           <targetsSelectedWithDialog>
             <Target>
               <type value="QUICK_BOOT_TARGET" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cb865f69..5653bfc3 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="jbr-17 (2)" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7f..35eb1ddf 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3d7ddf56..a9dc1af8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -10,15 +10,15 @@ plugins {
 }
 
 android {
-    namespace = "com.acclorite.books_history"
+    namespace = "ua.acclorite.book_story"
     compileSdk = 34
 
     defaultConfig {
-        applicationId = "com.acclorite.books_history"
+        applicationId = "ua.acclorite.book_story"
         minSdk = 26
         targetSdk = 34
         versionCode = 1
-        versionName = "0.6.0"
+        versionName = "0.8.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -140,4 +140,7 @@ dependencies {
     }
     implementation("org.slf4j:slf4j-android:latest.release")
     implementation("org.jsoup:jsoup:latest.release")
+
+    implementation("androidx.appcompat:appcompat:latest.release")
+    implementation("androidx.appcompat:appcompat-resources:latest.release")
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/acclorite/books_history/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/acclorite/books_history/ExampleInstrumentedTest.kt
deleted file mode 100644
index e001c9c8..00000000
--- a/app/src/androidTest/java/com/acclorite/books_history/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.acclorite.books_history
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.*
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.acclorite.books_history", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d48af3ed..b438d2f9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,9 +17,10 @@
         android:theme="@style/Theme.Start.Splash"
         android:enableOnBackInvokedCallback="true"
         tools:targetApi="tiramisu">
+
         <activity
             android:name=".MainActivity"
-            android:configChanges="screenSize|screenLayout|smallestScreenSize|locale|density"
+            android:configChanges="screenSize|screenLayout|smallestScreenSize|locale|density|uiMode"
             android:windowSoftInputMode="adjustResize"
             android:exported="true"
             android:theme="@style/Theme.Start.Splash">
@@ -28,6 +29,16 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <service
+            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
+            android:enabled="false"
+            android:exported="false">
+            <meta-data
+                android:name="autoStoreLocales"
+                android:value="true" />
+        </service>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/app_icon-playstore.png b/app/src/main/app_icon-playstore.png
deleted file mode 100644
index d8766d0ab42c921a7fafcc86b7a5db244cdf38d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26137
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
R2pk}E`O>wE#X1g;{|nD=(_;Vt

diff --git a/app/src/main/app_icon_mc-playstore.png b/app/src/main/app_icon_mc-playstore.png
deleted file mode 100644
index 31e72bd8eafc56f750b2b2af024389620fa4513b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15716
zcmeHucRbbo|Mv$;5iO%gxEfZt$_g1N4I`3~U1W6}%I4slN;Is?DrARb?;NvBC3|Kc
zly!2f?0xRn3D@=g{d+$i_x;CxfBz}!^LfwLc)p&m=jXY`jjN3G?DPnNFkZiQSrb91
z;YVs@&u;i@-nD%dL1YE5U%sg2YCK7x%hythss45L#N!t)aF4l9YgDRg`n@x&-1mo%
zc=cI-Yooh<gMXM((>h%F^z0q($e(e$M2{%c2ypW~JF;hWU@lEo*0-3k^gYuwVQST@
zaV1(-MzNyvQF(<y(fg@^eF$=S%&vw^g&?8wl=U1;fIklK{P)NIf6qaH5R2Wk7PY9)
zUh2m*9rs$kOX|poigx|++_{p9?l%0A;Wjtgk#Btq)%tcX&rPM+wP=_A?w%q$JIgl@
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

diff --git a/app/src/main/app_icon_monochromed-playstore.png b/app/src/main/app_icon_monochromed-playstore.png
deleted file mode 100644
index 0448c62f176a2f6fed40edf23e90f91762a4d4ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11549
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
E3zAR~f&c&j

diff --git a/app/src/main/deleteme-playstore.png b/app/src/main/deleteme-playstore.png
deleted file mode 100644
index ee0066a67fd6306d983ad8253047fd67c72c205e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7936
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
UhV?0P0RImB;<~qZ&*`iG12vt=qyPW_

diff --git a/app/src/main/java/com/acclorite/books_history/data/di/RepositoryModule.kt b/app/src/main/java/com/acclorite/books_history/data/di/RepositoryModule.kt
deleted file mode 100644
index 397e5bfe..00000000
--- a/app/src/main/java/com/acclorite/books_history/data/di/RepositoryModule.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.acclorite.books_history.data.di
-
-import com.acclorite.books_history.data.local.data_store.DataStore
-import com.acclorite.books_history.data.local.data_store.DataStoreImpl
-import com.acclorite.books_history.data.mapper.BookMapper
-import com.acclorite.books_history.data.mapper.BookMapperImpl
-import com.acclorite.books_history.data.repository.BookRepositoryImpl
-import com.acclorite.books_history.domain.repository.BookRepository
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-abstract class RepositoryModule {
-
-    @Binds
-    abstract fun bindDataStore(
-        dataStoreImpl: DataStoreImpl
-    ): DataStore
-
-    @Binds
-    @Singleton
-    abstract fun bindBookRepository(
-        bookRepositoryImpl: BookRepositoryImpl
-    ): BookRepository
-
-    @Binds
-    @Singleton
-    abstract fun bindBookMapper(
-        bookMapperImpl: BookMapperImpl
-    ): BookMapper
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/data/local/room/BookDatabase.kt b/app/src/main/java/com/acclorite/books_history/data/local/room/BookDatabase.kt
deleted file mode 100644
index 91c12767..00000000
--- a/app/src/main/java/com/acclorite/books_history/data/local/room/BookDatabase.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.acclorite.books_history.data.local.room
-
-import androidx.room.Database
-import androidx.room.RoomDatabase
-import com.acclorite.books_history.data.local.dto.BookEntity
-
-@Database(
-    entities = [BookEntity::class],
-    version = 1,
-    exportSchema = false
-)
-abstract class BookDatabase : RoomDatabase() {
-    abstract val dao: BookDao
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/data/mapper/BookMapper.kt b/app/src/main/java/com/acclorite/books_history/data/mapper/BookMapper.kt
deleted file mode 100644
index a904014c..00000000
--- a/app/src/main/java/com/acclorite/books_history/data/mapper/BookMapper.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.acclorite.books_history.data.mapper
-
-import com.acclorite.books_history.data.local.dto.BookEntity
-import com.acclorite.books_history.domain.model.Book
-
-interface BookMapper {
-    suspend fun toBookEntity(book: Book): BookEntity
-
-    suspend fun toBook(bookEntity: BookEntity): Book
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/data/parser/FileParser.kt b/app/src/main/java/com/acclorite/books_history/data/parser/FileParser.kt
deleted file mode 100644
index ad884b10..00000000
--- a/app/src/main/java/com/acclorite/books_history/data/parser/FileParser.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.acclorite.books_history.data.parser
-
-import com.acclorite.books_history.domain.model.Book
-import java.io.File
-
-interface FileParser {
-
-    suspend fun parse(file: File): Book?
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/data/parser/TextParser.kt b/app/src/main/java/com/acclorite/books_history/data/parser/TextParser.kt
deleted file mode 100644
index f3e14a23..00000000
--- a/app/src/main/java/com/acclorite/books_history/data/parser/TextParser.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.acclorite.books_history.data.parser
-
-import com.acclorite.books_history.domain.model.StringWithId
-import java.io.File
-
-interface TextParser {
-    suspend fun parse(file: File): List<StringWithId>
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/DeleteBooks.kt b/app/src/main/java/com/acclorite/books_history/domain/use_case/DeleteBooks.kt
deleted file mode 100644
index 7ffe9c27..00000000
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/DeleteBooks.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.acclorite.books_history.domain.use_case
-
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.repository.BookRepository
-import javax.inject.Inject
-
-class DeleteBooks @Inject constructor(private val repository: BookRepository) {
-
-    suspend fun execute(books: List<Book>) {
-        repository.deleteBooks(books)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/AnimatedTopAppBar.kt b/app/src/main/java/com/acclorite/books_history/presentation/components/AnimatedTopAppBar.kt
deleted file mode 100644
index 37e6eb14..00000000
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/AnimatedTopAppBar.kt
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.acclorite.books_history.presentation.components
-
-import androidx.compose.animation.animateColorAsState
-import androidx.compose.animation.core.Spring
-import androidx.compose.animation.core.spring
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.statusBars
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.TopAppBarScrollBehavior
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.ui.DefaultTransition
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun AnimatedTopAppBar(
-    containerColor: Color = MaterialTheme.colorScheme.surface,
-    scrolledContainerColor: Color?,
-
-    scrollBehavior: TopAppBarScrollBehavior?,
-    isTopBarScrolled: Boolean?,
-
-    content1Visibility: Boolean,
-    content1NavigationIcon: @Composable () -> Unit,
-    content1Title: @Composable () -> Unit,
-    content1Actions: @Composable RowScope.() -> Unit,
-
-    content2Visibility: Boolean,
-    content2NavigationIcon: @Composable () -> Unit,
-    content2Title: @Composable () -> Unit,
-    content2Actions: @Composable RowScope.() -> Unit,
-
-    content3Visibility: Boolean,
-    content3NavigationIcon: @Composable () -> Unit,
-    content3Title: @Composable () -> Unit,
-    content3Actions: @Composable RowScope.() -> Unit
-) {
-    val color =
-        if (isTopBarScrolled == true && scrolledContainerColor != null) scrolledContainerColor
-        else containerColor
-
-    val animatedColor by animateColorAsState(
-        targetValue = color,
-        animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
-        label = "TopAppBar color animation"
-    )
-
-    if (scrollBehavior != null && scrolledContainerColor != null) {
-        val isScrolled = scrollBehavior.state.overlappedFraction > 0.01f
-        val statusBarPadding = with(LocalDensity.current) {
-            WindowInsets.statusBars.getTop(LocalDensity.current).toDp()
-        }
-
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(64.dp + statusBarPadding)
-                .background(
-                    if (isScrolled) scrolledContainerColor
-                    else containerColor
-                )
-        )
-    }
-
-    Box(modifier = Modifier.fillMaxWidth()) {
-        DefaultTransition(visible = content1Visibility) {
-            TopAppBar(
-                navigationIcon = content1NavigationIcon,
-                title = content1Title,
-                actions = content1Actions,
-                scrollBehavior = scrollBehavior,
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = animatedColor,
-                    scrolledContainerColor = scrolledContainerColor ?: Color.Transparent
-                )
-            )
-        }
-
-        DefaultTransition(visible = content2Visibility) {
-            TopAppBar(
-                navigationIcon = content2NavigationIcon,
-                title = content2Title,
-                actions = content2Actions,
-                scrollBehavior = scrollBehavior,
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = animatedColor,
-                    scrolledContainerColor = scrolledContainerColor ?: Color.Transparent
-                )
-            )
-        }
-
-        DefaultTransition(visible = content3Visibility) {
-            TopAppBar(
-                navigationIcon = content3NavigationIcon,
-                title = content3Title,
-                actions = content3Actions,
-                scrollBehavior = scrollBehavior,
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = animatedColor,
-                    scrolledContainerColor = scrolledContainerColor ?: Color.Transparent
-                )
-            )
-        }
-    }
-}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/history/HistoryScreen.kt b/app/src/main/java/com/acclorite/books_history/presentation/screens/history/HistoryScreen.kt
deleted file mode 100644
index aeecb9c8..00000000
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/history/HistoryScreen.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.acclorite.books_history.presentation.screens.history
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.hilt.navigation.compose.hiltViewModel
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.screens.history.data.HistoryViewModel
-
-@Composable
-fun HistoryScreen(
-    viewModel: HistoryViewModel = hiltViewModel(),
-    navigator: Navigator
-) {
-    val state by viewModel.state.collectAsState()
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryEvent.kt b/app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryEvent.kt
deleted file mode 100644
index 6b699239..00000000
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryEvent.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.acclorite.books_history.presentation.screens.history.data
-
-sealed class HistoryEvent
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryState.kt b/app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryState.kt
deleted file mode 100644
index d35f6901..00000000
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryState.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.acclorite.books_history.presentation.screens.history.data
-
-data class HistoryState(
-    val foo: Int = 0
-)
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryViewModel.kt b/app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryViewModel.kt
deleted file mode 100644
index 5bce8000..00000000
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryViewModel.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.acclorite.books_history.presentation.screens.history.data
-
-import androidx.lifecycle.ViewModel
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import javax.inject.Inject
-
-@HiltViewModel
-class HistoryViewModel @Inject constructor(
-
-) : ViewModel() {
-
-    private val _state = MutableStateFlow(HistoryState())
-    val state = _state.asStateFlow()
-
-    fun onEvent(event: HistoryEvent) {
-        //
-    }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheetItem.kt b/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheetItem.kt
deleted file mode 100644
index b507e8f0..00000000
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheetItem.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.acclorite.books_history.presentation.screens.reader.components
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-
-@Composable
-fun ReaderSettingsBottomSheetItem(
-    modifier: Modifier = Modifier,
-    title: String,
-    description: String,
-    verticalPadding: Dp = 8.dp,
-    onClick: () -> Unit
-) {
-    Column(
-        modifier
-            .fillMaxWidth()
-            .clickable {
-                onClick()
-            }
-            .padding(horizontal = 18.dp, vertical = verticalPadding),
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.Start
-    ) {
-        Text(
-            title,
-            style = MaterialTheme.typography.bodyLarge,
-            color = MaterialTheme.colorScheme.onSurface,
-            fontSize = 18.sp
-        )
-        Spacer(modifier = Modifier.height(2.dp))
-        Text(
-            description,
-            style = MaterialTheme.typography.bodyMedium,
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SettingsOptionItem.kt b/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SettingsOptionItem.kt
deleted file mode 100644
index d14f85dc..00000000
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SettingsOptionItem.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.acclorite.books_history.presentation.screens.settings.components
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-
-@Composable
-fun SettingsOptionItem(
-    modifier: Modifier = Modifier,
-    title: String,
-    description: String,
-    verticalPadding: Dp = 8.dp,
-    onClick: () -> Unit
-) {
-    Column(
-        modifier
-            .fillMaxWidth()
-            .clickable {
-                onClick()
-            }
-            .padding(horizontal = 16.dp, vertical = verticalPadding),
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.Start
-    ) {
-        Text(
-            title,
-            style = MaterialTheme.typography.bodyLarge,
-            color = MaterialTheme.colorScheme.onSurface,
-            fontSize = 18.sp
-        )
-        Spacer(modifier = Modifier.height(2.dp))
-        Text(
-            description,
-            style = MaterialTheme.typography.bodyMedium,
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/MainActivity.kt b/app/src/main/java/ua/acclorite/book_story/MainActivity.kt
similarity index 76%
rename from app/src/main/java/com/acclorite/books_history/MainActivity.kt
rename to app/src/main/java/ua/acclorite/book_story/MainActivity.kt
index 72e285a7..e33f3564 100644
--- a/app/src/main/java/com/acclorite/books_history/MainActivity.kt
+++ b/app/src/main/java/ua/acclorite/book_story/MainActivity.kt
@@ -1,11 +1,15 @@
-package com.acclorite.books_history
+package ua.acclorite.book_story
 
 import android.content.res.Configuration
 import android.os.Bundle
-import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.slideInHorizontally
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -15,33 +19,29 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.presentation.NavigationHost
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.presentation.components.BottomNavigationBar
-import com.acclorite.books_history.presentation.data.MainEvent
-import com.acclorite.books_history.presentation.data.MainViewModel
-import com.acclorite.books_history.presentation.screens.book_info.BookInfoScreen
-import com.acclorite.books_history.presentation.screens.browse.BrowseScreen
-import com.acclorite.books_history.presentation.screens.history.HistoryScreen
-import com.acclorite.books_history.presentation.screens.library.LibraryScreen
-import com.acclorite.books_history.presentation.screens.reader.ReaderScreen
-import com.acclorite.books_history.presentation.screens.settings.SettingsScreen
-import com.acclorite.books_history.presentation.screens.settings.nested.appearance.AppearanceSettings
-import com.acclorite.books_history.presentation.screens.settings.nested.general.GeneralSettings
-import com.acclorite.books_history.ui.BooksHistoryResurrectionTheme
-import com.acclorite.books_history.ui.DefaultTransition
-import com.acclorite.books_history.ui.Transitions
-import com.acclorite.books_history.ui.isDark
-import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import dagger.hilt.android.AndroidEntryPoint
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.presentation.NavigationHost
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.presentation.components.BottomNavigationBar
+import ua.acclorite.book_story.presentation.data.MainEvent
+import ua.acclorite.book_story.presentation.data.MainViewModel
+import ua.acclorite.book_story.presentation.screens.book_info.BookInfoScreen
+import ua.acclorite.book_story.presentation.screens.browse.BrowseScreen
+import ua.acclorite.book_story.presentation.screens.history.HistoryScreen
+import ua.acclorite.book_story.presentation.screens.library.LibraryScreen
+import ua.acclorite.book_story.presentation.screens.reader.ReaderScreen
+import ua.acclorite.book_story.presentation.screens.settings.SettingsScreen
+import ua.acclorite.book_story.presentation.screens.settings.nested.appearance.AppearanceSettings
+import ua.acclorite.book_story.presentation.screens.settings.nested.general.GeneralSettings
+import ua.acclorite.book_story.ui.BooksHistoryResurrectionTheme
+import ua.acclorite.book_story.ui.Transitions
+import ua.acclorite.book_story.ui.isDark
 
-@OptIn(ExperimentalPermissionsApi::class)
 @AndroidEntryPoint
-class MainActivity : ComponentActivity() {
+class MainActivity : AppCompatActivity() {
     private val mainViewModel: MainViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -70,14 +70,17 @@ class MainActivity : ComponentActivity() {
                 if (!updating) {
                     NavigationHost(startScreen = Screen.LIBRARY) {
                         val currentScreen by this.getCurrentScreen().collectAsState()
-                        DefaultTransition(
+                        AnimatedVisibility(
                             visible = currentScreen == Screen.LIBRARY ||
                                     currentScreen == Screen.HISTORY ||
-                                    currentScreen == Screen.BROWSE
+                                    currentScreen == Screen.BROWSE,
+                            enter = fadeIn(tween(200)) +
+                                    slideInHorizontally(tween(200)) { it / 15 },
+                            exit = Transitions.SlidingTransitionOut
                         ) {
                             Scaffold(
                                 bottomBar = {
-                                    BottomNavigationBar(navigator = this)
+                                    BottomNavigationBar(navigator = this@NavigationHost)
                                 },
                                 containerColor = MaterialTheme.colorScheme.surface
                             ) {
@@ -122,8 +125,7 @@ class MainActivity : ComponentActivity() {
                             exitAnim = Transitions.SlidingTransitionOut
                         ) {
                             ReaderScreen(
-                                navigator = this@NavigationHost,
-                                mainViewModel = mainViewModel
+                                navigator = this@NavigationHost
                             )
                         }
 
@@ -145,7 +147,6 @@ class MainActivity : ComponentActivity() {
                             exitAnim = Transitions.SlidingTransitionOut
                         ) {
                             GeneralSettings(
-                                mainViewModel = mainViewModel,
                                 navigator = this@NavigationHost
                             )
                         }
@@ -155,7 +156,6 @@ class MainActivity : ComponentActivity() {
                             exitAnim = Transitions.SlidingTransitionOut
                         ) {
                             AppearanceSettings(
-                                mainViewModel = mainViewModel,
                                 navigator = this@NavigationHost
                             )
                         }
@@ -165,8 +165,7 @@ class MainActivity : ComponentActivity() {
                         modifier = Modifier
                             .fillMaxSize()
                             .background(
-                                if (darkTheme.isDark()) Color.Black
-                                else Color.White
+                                MaterialTheme.colorScheme.surface
                             )
                     )
                 }
diff --git a/app/src/main/java/com/acclorite/books_history/data/di/AppModule.kt b/app/src/main/java/ua/acclorite/book_story/data/di/AppModule.kt
similarity index 75%
rename from app/src/main/java/com/acclorite/books_history/data/di/AppModule.kt
rename to app/src/main/java/ua/acclorite/book_story/data/di/AppModule.kt
index 79b1e892..2202be40 100644
--- a/app/src/main/java/com/acclorite/books_history/data/di/AppModule.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/di/AppModule.kt
@@ -1,13 +1,13 @@
-package com.acclorite.books_history.data.di
+package ua.acclorite.book_story.data.di
 
 import android.app.Application
 import androidx.room.Room
-import com.acclorite.books_history.data.local.room.BookDao
-import com.acclorite.books_history.data.local.room.BookDatabase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import ua.acclorite.book_story.data.local.room.BookDao
+import ua.acclorite.book_story.data.local.room.BookDatabase
 import javax.inject.Singleton
 
 @Module
diff --git a/app/src/main/java/ua/acclorite/book_story/data/di/RepositoryModule.kt b/app/src/main/java/ua/acclorite/book_story/data/di/RepositoryModule.kt
new file mode 100644
index 00000000..a129eccf
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/data/di/RepositoryModule.kt
@@ -0,0 +1,43 @@
+package ua.acclorite.book_story.data.di
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import ua.acclorite.book_story.data.local.data_store.DataStore
+import ua.acclorite.book_story.data.local.data_store.DataStoreImpl
+import ua.acclorite.book_story.data.mapper.BookMapper
+import ua.acclorite.book_story.data.mapper.BookMapperImpl
+import ua.acclorite.book_story.data.mapper.HistoryMapper
+import ua.acclorite.book_story.data.mapper.HistoryMapperImpl
+import ua.acclorite.book_story.data.repository.BookRepositoryImpl
+import ua.acclorite.book_story.domain.repository.BookRepository
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class RepositoryModule {
+
+    @Binds
+    abstract fun bindDataStore(
+        dataStoreImpl: DataStoreImpl
+    ): DataStore
+
+    @Binds
+    @Singleton
+    abstract fun bindBookRepository(
+        bookRepositoryImpl: BookRepositoryImpl
+    ): BookRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindBookMapper(
+        bookMapperImpl: BookMapperImpl
+    ): BookMapper
+
+    @Binds
+    @Singleton
+    abstract fun bindHistoryMapper(
+        historyMapperImpl: HistoryMapperImpl
+    ): HistoryMapper
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/data/local/data_store/DataStore.kt b/app/src/main/java/ua/acclorite/book_story/data/local/data_store/DataStore.kt
similarity index 81%
rename from app/src/main/java/com/acclorite/books_history/data/local/data_store/DataStore.kt
rename to app/src/main/java/ua/acclorite/book_story/data/local/data_store/DataStore.kt
index ad23569a..62342537 100644
--- a/app/src/main/java/com/acclorite/books_history/data/local/data_store/DataStore.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/local/data_store/DataStore.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.data.local.data_store
+package ua.acclorite.book_story.data.local.data_store
 
 import androidx.datastore.preferences.core.Preferences
 import kotlinx.coroutines.flow.Flow
diff --git a/app/src/main/java/com/acclorite/books_history/data/local/data_store/DataStoreImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/local/data_store/DataStoreImpl.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/data/local/data_store/DataStoreImpl.kt
rename to app/src/main/java/ua/acclorite/book_story/data/local/data_store/DataStoreImpl.kt
index bcab84b2..ca8f3df2 100644
--- a/app/src/main/java/com/acclorite/books_history/data/local/data_store/DataStoreImpl.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/local/data_store/DataStoreImpl.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.data.local.data_store
+package ua.acclorite.book_story.data.local.data_store
 
 import android.app.Application
 import android.content.Context
diff --git a/app/src/main/java/com/acclorite/books_history/data/local/dto/BookEntity.kt b/app/src/main/java/ua/acclorite/book_story/data/local/dto/BookEntity.kt
similarity index 85%
rename from app/src/main/java/com/acclorite/books_history/data/local/dto/BookEntity.kt
rename to app/src/main/java/ua/acclorite/book_story/data/local/dto/BookEntity.kt
index 68cc6b11..08addf36 100644
--- a/app/src/main/java/com/acclorite/books_history/data/local/dto/BookEntity.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/local/dto/BookEntity.kt
@@ -1,8 +1,8 @@
-package com.acclorite.books_history.data.local.dto
+package ua.acclorite.book_story.data.local.dto
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.acclorite.books_history.domain.model.Category
+import ua.acclorite.book_story.domain.model.Category
 
 @Entity
 data class BookEntity(
diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/dto/HistoryEntity.kt b/app/src/main/java/ua/acclorite/book_story/data/local/dto/HistoryEntity.kt
new file mode 100644
index 00000000..dbdebc73
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/data/local/dto/HistoryEntity.kt
@@ -0,0 +1,12 @@
+package ua.acclorite.book_story.data.local.dto
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity
+data class HistoryEntity(
+    @PrimaryKey(true)
+    val id: Int? = null,
+    val bookId: Int,
+    val time: Long
+)
diff --git a/app/src/main/java/com/acclorite/books_history/data/local/room/BookDao.kt b/app/src/main/java/ua/acclorite/book_story/data/local/room/BookDao.kt
similarity index 54%
rename from app/src/main/java/com/acclorite/books_history/data/local/room/BookDao.kt
rename to app/src/main/java/ua/acclorite/book_story/data/local/room/BookDao.kt
index 7d93677e..eb3f9fec 100644
--- a/app/src/main/java/com/acclorite/books_history/data/local/room/BookDao.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/local/room/BookDao.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.data.local.room
+package ua.acclorite.book_story.data.local.room
 
 import androidx.room.Dao
 import androidx.room.Delete
@@ -6,7 +6,8 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
-import com.acclorite.books_history.data.local.dto.BookEntity
+import ua.acclorite.book_story.data.local.dto.BookEntity
+import ua.acclorite.book_story.data.local.dto.HistoryEntity
 
 @Dao
 interface BookDao {
@@ -35,4 +36,22 @@ interface BookDao {
 
     @Update
     suspend fun updateBooks(books: List<BookEntity>)
+
+
+    @Query("SELECT * FROM historyentity")
+    suspend fun getHistory(): List<HistoryEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertHistory(
+        history: List<HistoryEntity>
+    )
+
+    @Query("DELETE FROM historyentity")
+    suspend fun deleteWholeHistory()
+
+    @Query("DELETE FROM historyentity WHERE bookId = :bookId")
+    suspend fun deleteBookHistory(bookId: Int)
+
+    @Delete
+    suspend fun deleteHistory(history: List<HistoryEntity>)
 }
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/room/BookDatabase.kt b/app/src/main/java/ua/acclorite/book_story/data/local/room/BookDatabase.kt
new file mode 100644
index 00000000..232103de
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/data/local/room/BookDatabase.kt
@@ -0,0 +1,18 @@
+package ua.acclorite.book_story.data.local.room
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import ua.acclorite.book_story.data.local.dto.BookEntity
+import ua.acclorite.book_story.data.local.dto.HistoryEntity
+
+@Database(
+    entities = [
+        BookEntity::class,
+        HistoryEntity::class
+    ],
+    version = 1,
+    exportSchema = false
+)
+abstract class BookDatabase : RoomDatabase() {
+    abstract val dao: BookDao
+}
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/BookMapper.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/BookMapper.kt
new file mode 100644
index 00000000..e3fe7bce
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/BookMapper.kt
@@ -0,0 +1,10 @@
+package ua.acclorite.book_story.data.mapper
+
+import ua.acclorite.book_story.data.local.dto.BookEntity
+import ua.acclorite.book_story.domain.model.Book
+
+interface BookMapper {
+    suspend fun toBookEntity(book: Book): BookEntity
+
+    suspend fun toBook(bookEntity: BookEntity): Book
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/data/mapper/BookMapperImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/BookMapperImpl.kt
similarity index 85%
rename from app/src/main/java/com/acclorite/books_history/data/mapper/BookMapperImpl.kt
rename to app/src/main/java/ua/acclorite/book_story/data/mapper/BookMapperImpl.kt
index 7cee664d..f72eb061 100644
--- a/app/src/main/java/com/acclorite/books_history/data/mapper/BookMapperImpl.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/BookMapperImpl.kt
@@ -1,14 +1,14 @@
-package com.acclorite.books_history.data.mapper
+package ua.acclorite.book_story.data.mapper
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import com.acclorite.books_history.R
-import com.acclorite.books_history.data.local.dto.BookEntity
-import com.acclorite.books_history.data.parser.EpubFileParser
-import com.acclorite.books_history.data.parser.PdfFileParser
-import com.acclorite.books_history.data.parser.TxtFileParser
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.util.UIText
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.data.local.dto.BookEntity
+import ua.acclorite.book_story.data.parser.EpubFileParser
+import ua.acclorite.book_story.data.parser.PdfFileParser
+import ua.acclorite.book_story.data.parser.TxtFileParser
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.util.UIText
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.File
diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/HistoryMapper.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/HistoryMapper.kt
new file mode 100644
index 00000000..0648b0d0
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/HistoryMapper.kt
@@ -0,0 +1,11 @@
+package ua.acclorite.book_story.data.mapper
+
+import ua.acclorite.book_story.data.local.dto.HistoryEntity
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.History
+
+interface HistoryMapper {
+    suspend fun toHistoryEntity(history: History): HistoryEntity
+
+    suspend fun toHistory(historyEntity: HistoryEntity, book: Book): History
+}
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/HistoryMapperImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/HistoryMapperImpl.kt
new file mode 100644
index 00000000..81c8ef76
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/HistoryMapperImpl.kt
@@ -0,0 +1,24 @@
+package ua.acclorite.book_story.data.mapper
+
+import ua.acclorite.book_story.data.local.dto.HistoryEntity
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.History
+import javax.inject.Inject
+
+class HistoryMapperImpl @Inject constructor() : HistoryMapper {
+    override suspend fun toHistoryEntity(history: History): HistoryEntity {
+        return HistoryEntity(
+            id = history.id,
+            bookId = history.book.id ?: 0,
+            time = history.time
+        )
+    }
+
+    override suspend fun toHistory(historyEntity: HistoryEntity, book: Book): History {
+        return History(
+            historyEntity.id,
+            book = book,
+            time = historyEntity.time
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/data/parser/EpubFileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/EpubFileParser.kt
similarity index 79%
rename from app/src/main/java/com/acclorite/books_history/data/parser/EpubFileParser.kt
rename to app/src/main/java/ua/acclorite/book_story/data/parser/EpubFileParser.kt
index 006dd7e9..3547b05a 100644
--- a/app/src/main/java/com/acclorite/books_history/data/parser/EpubFileParser.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/EpubFileParser.kt
@@ -1,10 +1,12 @@
-package com.acclorite.books_history.data.parser
+package ua.acclorite.book_story.data.parser
 
 import android.graphics.BitmapFactory
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.util.UIText
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import nl.siegmann.epublib.epub.EpubReader
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.util.UIText
 import java.io.File
 import java.io.FileInputStream
 import javax.inject.Inject
@@ -18,7 +20,9 @@ class EpubFileParser @Inject constructor() : FileParser {
 
         try {
             val epubReader = EpubReader()
-            val book = epubReader.readEpub(FileInputStream(file))
+            val book = withContext(Dispatchers.IO) {
+                epubReader.readEpub(FileInputStream(file))
+            }
 
             val metadata = book.metadata
             val author = UIText.StringValue(metadata.authors.joinToString(", "))
diff --git a/app/src/main/java/com/acclorite/books_history/data/parser/EpubTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/EpubTextParser.kt
similarity index 74%
rename from app/src/main/java/com/acclorite/books_history/data/parser/EpubTextParser.kt
rename to app/src/main/java/ua/acclorite/book_story/data/parser/EpubTextParser.kt
index 0fc99892..c8ee1158 100644
--- a/app/src/main/java/com/acclorite/books_history/data/parser/EpubTextParser.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/EpubTextParser.kt
@@ -1,8 +1,10 @@
-package com.acclorite.books_history.data.parser
+package ua.acclorite.book_story.data.parser
 
-import com.acclorite.books_history.domain.model.StringWithId
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import nl.siegmann.epublib.epub.EpubReader
 import org.jsoup.Jsoup
+import ua.acclorite.book_story.domain.model.StringWithId
 import java.io.BufferedReader
 import java.io.File
 import java.io.FileInputStream
@@ -18,7 +20,9 @@ class EpubTextParser @Inject constructor() : TextParser {
         }
 
         try {
-            val book = EpubReader().readEpub(FileInputStream(file))
+            val book = withContext(Dispatchers.IO) {
+                EpubReader().readEpub(FileInputStream(file))
+            }
             val unformattedText = StringBuilder()
 
             for (spineReference in book.spine.spineReferences) {
@@ -28,7 +32,9 @@ class EpubTextParser @Inject constructor() : TextParser {
                     BufferedReader(InputStreamReader(inputStream, Charset.forName("UTF-8")))
                 var line: String?
 
-                while (reader.readLine().also { line = it } != null) {
+                while (withContext(Dispatchers.IO) {
+                        reader.readLine()
+                    }.also { line = it } != null) {
                     unformattedText.append(line).append("\n")
                 }
             }
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/FileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/FileParser.kt
new file mode 100644
index 00000000..270f9846
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/FileParser.kt
@@ -0,0 +1,9 @@
+package ua.acclorite.book_story.data.parser
+
+import ua.acclorite.book_story.domain.model.Book
+import java.io.File
+
+interface FileParser {
+
+    suspend fun parse(file: File): Book?
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/data/parser/PdfFileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/PdfFileParser.kt
similarity index 82%
rename from app/src/main/java/com/acclorite/books_history/data/parser/PdfFileParser.kt
rename to app/src/main/java/ua/acclorite/book_story/data/parser/PdfFileParser.kt
index 2072a98c..36badf5c 100644
--- a/app/src/main/java/com/acclorite/books_history/data/parser/PdfFileParser.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/PdfFileParser.kt
@@ -1,13 +1,13 @@
-package com.acclorite.books_history.data.parser
+package ua.acclorite.book_story.data.parser
 
 import android.app.Application
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.domain.model.StringWithId
-import com.acclorite.books_history.util.UIText
 import com.tom_roush.pdfbox.android.PDFBoxResourceLoader
 import com.tom_roush.pdfbox.pdmodel.PDDocument
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.domain.model.StringWithId
+import ua.acclorite.book_story.util.UIText
 import java.io.File
 import javax.inject.Inject
 
diff --git a/app/src/main/java/com/acclorite/books_history/data/parser/PdfTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/PdfTextParser.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/data/parser/PdfTextParser.kt
rename to app/src/main/java/ua/acclorite/book_story/data/parser/PdfTextParser.kt
index 92d9dd86..42391f12 100644
--- a/app/src/main/java/com/acclorite/books_history/data/parser/PdfTextParser.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/PdfTextParser.kt
@@ -1,10 +1,10 @@
-package com.acclorite.books_history.data.parser
+package ua.acclorite.book_story.data.parser
 
 import android.app.Application
-import com.acclorite.books_history.domain.model.StringWithId
 import com.tom_roush.pdfbox.android.PDFBoxResourceLoader
 import com.tom_roush.pdfbox.pdmodel.PDDocument
 import com.tom_roush.pdfbox.text.PDFTextStripper
+import ua.acclorite.book_story.domain.model.StringWithId
 import java.io.File
 import javax.inject.Inject
 
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/TextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/TextParser.kt
new file mode 100644
index 00000000..50be3cec
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/TextParser.kt
@@ -0,0 +1,8 @@
+package ua.acclorite.book_story.data.parser
+
+import ua.acclorite.book_story.domain.model.StringWithId
+import java.io.File
+
+interface TextParser {
+    suspend fun parse(file: File): List<StringWithId>
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/data/parser/TxtFileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/TxtFileParser.kt
similarity index 75%
rename from app/src/main/java/com/acclorite/books_history/data/parser/TxtFileParser.kt
rename to app/src/main/java/ua/acclorite/book_story/data/parser/TxtFileParser.kt
index 76cd8224..bb7f0fe1 100644
--- a/app/src/main/java/com/acclorite/books_history/data/parser/TxtFileParser.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/TxtFileParser.kt
@@ -1,10 +1,10 @@
-package com.acclorite.books_history.data.parser
+package ua.acclorite.book_story.data.parser
 
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.domain.model.StringWithId
-import com.acclorite.books_history.util.UIText
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.domain.model.StringWithId
+import ua.acclorite.book_story.util.UIText
 import java.io.File
 import javax.inject.Inject
 
diff --git a/app/src/main/java/com/acclorite/books_history/data/parser/TxtTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/TxtTextParser.kt
similarity index 55%
rename from app/src/main/java/com/acclorite/books_history/data/parser/TxtTextParser.kt
rename to app/src/main/java/ua/acclorite/book_story/data/parser/TxtTextParser.kt
index 0181aa61..1964463a 100644
--- a/app/src/main/java/com/acclorite/books_history/data/parser/TxtTextParser.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/TxtTextParser.kt
@@ -1,6 +1,8 @@
-package com.acclorite.books_history.data.parser
+package ua.acclorite.book_story.data.parser
 
-import com.acclorite.books_history.domain.model.StringWithId
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import ua.acclorite.book_story.domain.model.StringWithId
 import java.io.BufferedReader
 import java.io.File
 import java.io.FileReader
@@ -16,10 +18,12 @@ class TxtTextParser @Inject constructor() : TextParser {
         return try {
             val formattedLines = mutableListOf<StringWithId>()
 
-            BufferedReader(FileReader(file)).forEachLine { line ->
-                formattedLines.add(
-                    StringWithId(line)
-                )
+            withContext(Dispatchers.IO) {
+                BufferedReader(FileReader(file)).forEachLine { line ->
+                    formattedLines.add(
+                        StringWithId(line)
+                    )
+                }
             }
 
             formattedLines
diff --git a/app/src/main/java/com/acclorite/books_history/data/repository/BookRepositoryImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt
similarity index 76%
rename from app/src/main/java/com/acclorite/books_history/data/repository/BookRepositoryImpl.kt
rename to app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt
index 14a393a7..30a15dd3 100644
--- a/app/src/main/java/com/acclorite/books_history/data/repository/BookRepositoryImpl.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt
@@ -1,25 +1,27 @@
-package com.acclorite.books_history.data.repository
+package ua.acclorite.book_story.data.repository
 
 import android.os.Environment
 import androidx.datastore.preferences.core.Preferences
-import com.acclorite.books_history.data.local.data_store.DataStore
-import com.acclorite.books_history.data.local.dto.BookEntity
-import com.acclorite.books_history.data.local.room.BookDao
-import com.acclorite.books_history.data.mapper.BookMapper
-import com.acclorite.books_history.data.parser.EpubFileParser
-import com.acclorite.books_history.data.parser.EpubTextParser
-import com.acclorite.books_history.data.parser.PdfFileParser
-import com.acclorite.books_history.data.parser.PdfTextParser
-import com.acclorite.books_history.data.parser.TxtFileParser
-import com.acclorite.books_history.data.parser.TxtTextParser
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.NullableBook
-import com.acclorite.books_history.domain.model.StringWithId
-import com.acclorite.books_history.domain.repository.BookRepository
-import com.acclorite.books_history.util.Constants
-import com.acclorite.books_history.util.Resource
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
+import ua.acclorite.book_story.data.local.data_store.DataStore
+import ua.acclorite.book_story.data.local.dto.BookEntity
+import ua.acclorite.book_story.data.local.room.BookDao
+import ua.acclorite.book_story.data.mapper.BookMapper
+import ua.acclorite.book_story.data.mapper.HistoryMapper
+import ua.acclorite.book_story.data.parser.EpubFileParser
+import ua.acclorite.book_story.data.parser.EpubTextParser
+import ua.acclorite.book_story.data.parser.PdfFileParser
+import ua.acclorite.book_story.data.parser.PdfTextParser
+import ua.acclorite.book_story.data.parser.TxtFileParser
+import ua.acclorite.book_story.data.parser.TxtTextParser
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.History
+import ua.acclorite.book_story.domain.model.NullableBook
+import ua.acclorite.book_story.domain.model.StringWithId
+import ua.acclorite.book_story.domain.repository.BookRepository
+import ua.acclorite.book_story.util.Constants
+import ua.acclorite.book_story.util.Resource
 import java.io.File
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -30,6 +32,7 @@ class BookRepositoryImpl @Inject constructor(
     private val dataStore: DataStore,
 
     private val bookMapper: BookMapper,
+    private val historyMapper: HistoryMapper,
 
     private val txtFileParser: TxtFileParser,
     private val pdfFileParser: PdfFileParser,
@@ -233,6 +236,38 @@ class BookRepositoryImpl @Inject constructor(
             emit(Resource.Success(books))
         }
     }
+
+    override suspend fun insertHistory(history: List<History>) {
+        database.insertHistory(history.map { historyMapper.toHistoryEntity(it) })
+    }
+
+    override suspend fun getHistory(): Flow<Resource<List<History>>> {
+        return flow {
+            emit(Resource.Loading(true))
+
+            val history = database.getHistory()
+            emit(
+                Resource.Success(
+                    data = history.map {
+                        val book = database.findBookById(it.bookId)
+                        historyMapper.toHistory(it, bookMapper.toBook(book))
+                    }
+                )
+            )
+        }
+    }
+
+    override suspend fun deleteWholeHistory() {
+        database.deleteWholeHistory()
+    }
+
+    override suspend fun deleteBookHistory(bookId: Int) {
+        database.deleteBookHistory(bookId)
+    }
+
+    override suspend fun deleteHistory(history: List<History>) {
+        database.deleteHistory(history.map { historyMapper.toHistoryEntity(it) })
+    }
 }
 
 
@@ -248,3 +283,4 @@ class BookRepositoryImpl @Inject constructor(
 
 
 
+
diff --git a/app/src/main/java/com/acclorite/books_history/domain/model/Book.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/Book.kt
similarity index 78%
rename from app/src/main/java/com/acclorite/books_history/domain/model/Book.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/model/Book.kt
index 4ee2c4ae..985463a3 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/model/Book.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/model/Book.kt
@@ -1,21 +1,21 @@
-package com.acclorite.books_history.domain.model
-
-import android.graphics.Bitmap
-import androidx.compose.runtime.Immutable
-import com.acclorite.books_history.util.UIText
-import java.io.File
-
-@Immutable
-data class Book(
-    val id: Int?,
-    val title: String,
-    val author: UIText,
-    val description: String?,
-    val text: List<StringWithId> = emptyList(),
-    val progress: Float,
-    val file: File?,
-    val filePath: String,
-    val lastOpened: Long?,
-    val category: Category,
-    val coverImage: Bitmap?
-)
+package ua.acclorite.book_story.domain.model
+
+import android.graphics.Bitmap
+import androidx.compose.runtime.Immutable
+import ua.acclorite.book_story.util.UIText
+import java.io.File
+
+@Immutable
+data class Book(
+    val id: Int?,
+    val title: String,
+    val author: UIText,
+    val description: String?,
+    val text: List<StringWithId> = emptyList(),
+    val progress: Float,
+    val file: File?,
+    val filePath: String,
+    val lastOpened: Long?,
+    val category: Category,
+    val coverImage: Bitmap?
+)
diff --git a/app/src/main/java/com/acclorite/books_history/domain/model/Category.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/Category.kt
similarity index 58%
rename from app/src/main/java/com/acclorite/books_history/domain/model/Category.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/model/Category.kt
index 55c56261..dfbb5321 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/model/Category.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/model/Category.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.domain.model
+package ua.acclorite.book_story.domain.model
 
 enum class Category {
     READING, ALREADY_READ, PLANNING, DROPPED
diff --git a/app/src/main/java/com/acclorite/books_history/domain/model/ChipItem.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/ChipItem.kt
similarity index 81%
rename from app/src/main/java/com/acclorite/books_history/domain/model/ChipItem.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/model/ChipItem.kt
index 759ecec0..185f16b1 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/model/ChipItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/model/ChipItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.domain.model
+package ua.acclorite.book_story.domain.model
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.text.TextStyle
diff --git a/app/src/main/java/com/acclorite/books_history/domain/model/FontWithName.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/FontWithName.kt
similarity index 67%
rename from app/src/main/java/com/acclorite/books_history/domain/model/FontWithName.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/model/FontWithName.kt
index a423a6ea..a6242f1b 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/model/FontWithName.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/model/FontWithName.kt
@@ -1,8 +1,8 @@
-package com.acclorite.books_history.domain.model
+package ua.acclorite.book_story.domain.model
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.text.font.FontFamily
-import com.acclorite.books_history.util.UIText
+import ua.acclorite.book_story.util.UIText
 
 @Immutable
 data class FontWithName(
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/model/GroupedHistory.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/GroupedHistory.kt
new file mode 100644
index 00000000..2c51a68c
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/domain/model/GroupedHistory.kt
@@ -0,0 +1,9 @@
+package ua.acclorite.book_story.domain.model
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+data class GroupedHistory(
+    val title: String,
+    val history: List<History>
+)
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/model/History.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/History.kt
new file mode 100644
index 00000000..1e9d8ada
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/domain/model/History.kt
@@ -0,0 +1,10 @@
+package ua.acclorite.book_story.domain.model
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+data class History(
+    val id: Int?,
+    val book: Book,
+    val time: Long
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/domain/model/NavigationBarItem.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/NavigationBarItem.kt
similarity index 82%
rename from app/src/main/java/com/acclorite/books_history/domain/model/NavigationBarItem.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/model/NavigationBarItem.kt
index cc1476c4..ff897133 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/model/NavigationBarItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/model/NavigationBarItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.domain.model
+package ua.acclorite.book_story.domain.model
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.painter.Painter
diff --git a/app/src/main/java/com/acclorite/books_history/domain/model/NullableBook.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/NullableBook.kt
similarity index 81%
rename from app/src/main/java/com/acclorite/books_history/domain/model/NullableBook.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/model/NullableBook.kt
index 51e05e11..014b0940 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/model/NullableBook.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/model/NullableBook.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.domain.model
+package ua.acclorite.book_story.domain.model
 
 sealed class NullableBook(val book: Pair<Book, Boolean>?, val fileName: String?) {
     class NotNull(book: Pair<Book, Boolean>) : NullableBook(book, null)
diff --git a/app/src/main/java/com/acclorite/books_history/domain/model/StringWithId.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/StringWithId.kt
similarity index 80%
rename from app/src/main/java/com/acclorite/books_history/domain/model/StringWithId.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/model/StringWithId.kt
index 85b15c6c..f8e99868 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/model/StringWithId.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/model/StringWithId.kt
@@ -1,13 +1,13 @@
-package com.acclorite.books_history.domain.model
-
-import android.os.Parcelable
-import androidx.compose.runtime.Immutable
-import kotlinx.parcelize.Parcelize
-import java.util.UUID
-
-@Parcelize
-@Immutable
-data class StringWithId(
-    val line: String,
-    val id: String = UUID.randomUUID().toString()
-) : Parcelable
+package ua.acclorite.book_story.domain.model
+
+import android.os.Parcelable
+import androidx.compose.runtime.Immutable
+import kotlinx.parcelize.Parcelize
+import java.util.UUID
+
+@Parcelize
+@Immutable
+data class StringWithId(
+    val line: String,
+    val id: String = UUID.randomUUID().toString()
+) : Parcelable
diff --git a/app/src/main/java/com/acclorite/books_history/domain/repository/BookRepository.kt b/app/src/main/java/ua/acclorite/book_story/domain/repository/BookRepository.kt
similarity index 61%
rename from app/src/main/java/com/acclorite/books_history/domain/repository/BookRepository.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/repository/BookRepository.kt
index 4d5fc4e4..b2bf1844 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/repository/BookRepository.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/repository/BookRepository.kt
@@ -1,12 +1,13 @@
-package com.acclorite.books_history.domain.repository
+package ua.acclorite.book_story.domain.repository
 
 import androidx.datastore.preferences.core.Preferences
-import com.acclorite.books_history.data.local.dto.BookEntity
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.NullableBook
-import com.acclorite.books_history.domain.model.StringWithId
-import com.acclorite.books_history.util.Resource
 import kotlinx.coroutines.flow.Flow
+import ua.acclorite.book_story.data.local.dto.BookEntity
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.History
+import ua.acclorite.book_story.domain.model.NullableBook
+import ua.acclorite.book_story.domain.model.StringWithId
+import ua.acclorite.book_story.util.Resource
 import java.io.File
 
 interface BookRepository {
@@ -50,4 +51,17 @@ interface BookRepository {
     suspend fun getBookTextFromFile(file: File): Flow<Resource<List<StringWithId>>>
 
     suspend fun getBooksFromFiles(files: List<File>): Flow<Resource<List<NullableBook>>>
+
+
+    suspend fun insertHistory(history: List<History>)
+
+    suspend fun getHistory(): Flow<Resource<List<History>>>
+
+    suspend fun deleteWholeHistory()
+
+    suspend fun deleteBookHistory(bookId: Int)
+
+    suspend fun deleteHistory(
+        history: List<History>
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/ChangeLanguage.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/ChangeLanguage.kt
similarity index 74%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/ChangeLanguage.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/ChangeLanguage.kt
index dc4ffe75..99341fcc 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/ChangeLanguage.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/ChangeLanguage.kt
@@ -1,12 +1,14 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
+import android.annotation.SuppressLint
 import androidx.activity.ComponentActivity
-import com.acclorite.books_history.domain.repository.BookRepository
-import com.acclorite.books_history.util.DataStoreConstants
+import ua.acclorite.book_story.domain.repository.BookRepository
+import ua.acclorite.book_story.util.DataStoreConstants
 import java.util.Locale
 import javax.inject.Inject
 
 class ChangeLanguage @Inject constructor(private val repository: BookRepository) {
+    @SuppressLint("AppBundleLocaleChanges")
     suspend fun execute(language: String, activity: ComponentActivity) {
         val config = activity.resources.configuration
         val resources = activity.resources
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteBooks.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteBooks.kt
new file mode 100644
index 00000000..b1f1236f
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteBooks.kt
@@ -0,0 +1,17 @@
+package ua.acclorite.book_story.domain.use_case
+
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.repository.BookRepository
+import javax.inject.Inject
+
+class DeleteBooks @Inject constructor(private val repository: BookRepository) {
+
+    suspend fun execute(books: List<Book>) {
+        repository.deleteBooks(books)
+        books.forEach {
+            if (it.id != null) {
+                repository.deleteBookHistory(it.id)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteHistory.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteHistory.kt
new file mode 100644
index 00000000..90ad74ed
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteHistory.kt
@@ -0,0 +1,12 @@
+package ua.acclorite.book_story.domain.use_case
+
+import ua.acclorite.book_story.domain.model.History
+import ua.acclorite.book_story.domain.repository.BookRepository
+import javax.inject.Inject
+
+class DeleteHistory @Inject constructor(private val repository: BookRepository) {
+
+    suspend fun execute(history: List<History>) {
+        repository.deleteHistory(history)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteWholeHistory.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteWholeHistory.kt
new file mode 100644
index 00000000..2bc8b897
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteWholeHistory.kt
@@ -0,0 +1,11 @@
+package ua.acclorite.book_story.domain.use_case
+
+import ua.acclorite.book_story.domain.repository.BookRepository
+import javax.inject.Inject
+
+class DeleteWholeHistory @Inject constructor(private val repository: BookRepository) {
+
+    suspend fun execute() {
+        repository.deleteWholeHistory()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/FastGetBooks.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/FastGetBooks.kt
similarity index 55%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/FastGetBooks.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/FastGetBooks.kt
index cb33357b..8f1628a8 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/FastGetBooks.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/FastGetBooks.kt
@@ -1,7 +1,7 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.repository.BookRepository
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.repository.BookRepository
 import javax.inject.Inject
 
 class FastGetBooks @Inject constructor(private val repository: BookRepository) {
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetBooks.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetBooks.kt
similarity index 54%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/GetBooks.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/GetBooks.kt
index 0dc9a0a3..c6eeb698 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetBooks.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetBooks.kt
@@ -1,9 +1,9 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.repository.BookRepository
-import com.acclorite.books_history.util.Resource
 import kotlinx.coroutines.flow.Flow
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.repository.BookRepository
+import ua.acclorite.book_story.util.Resource
 import javax.inject.Inject
 
 class GetBooks @Inject constructor(private val repository: BookRepository) {
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetBooksFromFiles.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetBooksFromFiles.kt
similarity index 57%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/GetBooksFromFiles.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/GetBooksFromFiles.kt
index 14cbc690..b8d0374d 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetBooksFromFiles.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetBooksFromFiles.kt
@@ -1,9 +1,9 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
-import com.acclorite.books_history.domain.model.NullableBook
-import com.acclorite.books_history.domain.repository.BookRepository
-import com.acclorite.books_history.util.Resource
 import kotlinx.coroutines.flow.Flow
+import ua.acclorite.book_story.domain.model.NullableBook
+import ua.acclorite.book_story.domain.repository.BookRepository
+import ua.acclorite.book_story.util.Resource
 import java.io.File
 import javax.inject.Inject
 
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetDatastore.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetDatastore.kt
similarity index 75%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/GetDatastore.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/GetDatastore.kt
index 56f9654a..f6581105 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetDatastore.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetDatastore.kt
@@ -1,8 +1,8 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
 import androidx.datastore.preferences.core.Preferences
-import com.acclorite.books_history.domain.repository.BookRepository
 import kotlinx.coroutines.flow.Flow
+import ua.acclorite.book_story.domain.repository.BookRepository
 import javax.inject.Inject
 
 class GetDatastore @Inject constructor(private val repository: BookRepository) {
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetFilesFromDownloads.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetFilesFromDownloads.kt
similarity index 64%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/GetFilesFromDownloads.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/GetFilesFromDownloads.kt
index 53689ff9..b2d15ef7 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetFilesFromDownloads.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetFilesFromDownloads.kt
@@ -1,8 +1,8 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
-import com.acclorite.books_history.domain.repository.BookRepository
-import com.acclorite.books_history.util.Resource
 import kotlinx.coroutines.flow.Flow
+import ua.acclorite.book_story.domain.repository.BookRepository
+import ua.acclorite.book_story.util.Resource
 import java.io.File
 import javax.inject.Inject
 
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetHistory.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetHistory.kt
new file mode 100644
index 00000000..2745db62
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetHistory.kt
@@ -0,0 +1,14 @@
+package ua.acclorite.book_story.domain.use_case
+
+import kotlinx.coroutines.flow.Flow
+import ua.acclorite.book_story.domain.model.History
+import ua.acclorite.book_story.domain.repository.BookRepository
+import ua.acclorite.book_story.util.Resource
+import javax.inject.Inject
+
+class GetHistory @Inject constructor(private val repository: BookRepository) {
+
+    suspend fun execute(): Flow<Resource<List<History>>> {
+        return repository.getHistory()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetText.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetText.kt
similarity index 56%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/GetText.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/GetText.kt
index ef7bdcb1..7bfab049 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetText.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetText.kt
@@ -1,9 +1,9 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
-import com.acclorite.books_history.domain.model.StringWithId
-import com.acclorite.books_history.domain.repository.BookRepository
-import com.acclorite.books_history.util.Resource
 import kotlinx.coroutines.flow.Flow
+import ua.acclorite.book_story.domain.model.StringWithId
+import ua.acclorite.book_story.domain.repository.BookRepository
+import ua.acclorite.book_story.util.Resource
 import java.io.File
 import javax.inject.Inject
 
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/InsertBooks.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/InsertBooks.kt
similarity index 53%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/InsertBooks.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/InsertBooks.kt
index 8fde956b..9edadf50 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/InsertBooks.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/InsertBooks.kt
@@ -1,7 +1,7 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.repository.BookRepository
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.repository.BookRepository
 import javax.inject.Inject
 
 class InsertBooks @Inject constructor(private val repository: BookRepository) {
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/InsertHistory.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/InsertHistory.kt
new file mode 100644
index 00000000..45a168ca
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/InsertHistory.kt
@@ -0,0 +1,11 @@
+package ua.acclorite.book_story.domain.use_case
+
+import ua.acclorite.book_story.domain.model.History
+import ua.acclorite.book_story.domain.repository.BookRepository
+import javax.inject.Inject
+
+class InsertHistory @Inject constructor(private val repository: BookRepository) {
+    suspend fun execute(history: List<History>) {
+        repository.insertHistory(history)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/SetDatastore.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/SetDatastore.kt
similarity index 70%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/SetDatastore.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/SetDatastore.kt
index f536c350..5e1beaa9 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/SetDatastore.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/SetDatastore.kt
@@ -1,7 +1,7 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
 import androidx.datastore.preferences.core.Preferences
-import com.acclorite.books_history.domain.repository.BookRepository
+import ua.acclorite.book_story.domain.repository.BookRepository
 import javax.inject.Inject
 
 class SetDatastore @Inject constructor(private val repository: BookRepository) {
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/UpdateBooks.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/UpdateBooks.kt
similarity index 53%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/UpdateBooks.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/UpdateBooks.kt
index 36222a8b..77815cb3 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/UpdateBooks.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/UpdateBooks.kt
@@ -1,7 +1,7 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.repository.BookRepository
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.repository.BookRepository
 import javax.inject.Inject
 
 class UpdateBooks @Inject constructor(private val repository: BookRepository) {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/Navigation.kt b/app/src/main/java/ua/acclorite/book_story/presentation/Navigation.kt
similarity index 96%
rename from app/src/main/java/com/acclorite/books_history/presentation/Navigation.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/Navigation.kt
index b8d2581d..ac384499 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/Navigation.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/Navigation.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation
+package ua.acclorite.book_story.presentation
 
 import android.annotation.SuppressLint
 import androidx.activity.ComponentActivity
@@ -20,7 +20,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.acclorite.books_history.ui.Transitions
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -29,6 +28,7 @@ import dagger.hilt.android.lifecycle.withCreationCallback
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
+import ua.acclorite.book_story.ui.Transitions
 
 
 private const val CURRENT_SCREEN = "current_screen"
@@ -155,8 +155,8 @@ class Navigator @AssistedInject constructor(
     @Composable
     fun composable(
         screen: Screen,
-        enterAnim: EnterTransition = Transitions.DefaultTransitionIn,
-        exitAnim: ExitTransition = Transitions.DefaultTransitionOut,
+        enterAnim: EnterTransition = Transitions.FadeTransitionIn,
+        exitAnim: ExitTransition = Transitions.FadeTransitionOut,
         content: @Composable () -> Unit
     ) {
         AnimatedVisibility(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/AnimatedTopAppBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/AnimatedTopAppBar.kt
new file mode 100644
index 00000000..275ee0a6
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/AnimatedTopAppBar.kt
@@ -0,0 +1,141 @@
+package ua.acclorite.book_story.presentation.components
+
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.spring
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.TopAppBarScrollBehavior
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.dp
+import ua.acclorite.book_story.ui.DefaultTransition
+import ua.acclorite.book_story.ui.elevation
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AnimatedTopAppBar(
+    containerColor: Color = MaterialTheme.colorScheme.surface,
+    scrolledContainerColor: Color? = MaterialTheme.elevation(),
+
+    scrollBehavior: TopAppBarScrollBehavior?,
+    isTopBarScrolled: Boolean?,
+
+    content1Visibility: Boolean? = null,
+    content1NavigationIcon: @Composable () -> Unit,
+    content1Title: @Composable () -> Unit,
+    content1Actions: @Composable RowScope.() -> Unit,
+
+    content2Visibility: Boolean? = null,
+    content2NavigationIcon: @Composable () -> Unit = {},
+    content2Title: @Composable () -> Unit = {},
+    content2Actions: @Composable RowScope.() -> Unit = {},
+
+    content3Visibility: Boolean? = null,
+    content3NavigationIcon: @Composable () -> Unit = {},
+    content3Title: @Composable () -> Unit = {},
+    content3Actions: @Composable RowScope.() -> Unit = {}
+) {
+    Box(modifier = Modifier.fillMaxWidth()) {
+        if ((scrollBehavior != null || isTopBarScrolled != null) && scrolledContainerColor != null) {
+
+            val fraction by remember {
+                derivedStateOf {
+                    scrollBehavior?.state?.overlappedFraction ?: 0f
+                }
+            }
+
+            val isScrolled = if (scrollBehavior != null) {
+                fraction > 0.01f
+            } else isTopBarScrolled ?: false
+
+            val color = if (isScrolled) scrolledContainerColor else containerColor
+            val animatedColor by animateColorAsState(
+                targetValue = color,
+                animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
+                label = "TopAppBar color animation"
+            )
+
+            val statusBarPadding = with(LocalDensity.current) {
+                WindowInsets.statusBars.getTop(LocalDensity.current).toDp()
+            }
+
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(64.dp + statusBarPadding)
+                    .background(
+                        animatedColor
+                    )
+            )
+        }
+
+        DefaultTransition(visible = content1Visibility ?: true) {
+            TopAppBar(
+                navigationIcon = content1NavigationIcon,
+                title = content1Title,
+                actions = content1Actions,
+                scrollBehavior = scrollBehavior,
+                colors = TopAppBarDefaults.topAppBarColors(
+                    containerColor = Color.Transparent,
+                    scrolledContainerColor = Color.Transparent
+                )
+            )
+        }
+
+        if (content2Visibility != null) {
+            DefaultTransition(visible = content2Visibility) {
+                TopAppBar(
+                    navigationIcon = content2NavigationIcon,
+                    title = content2Title,
+                    actions = content2Actions,
+                    scrollBehavior = scrollBehavior,
+                    colors = TopAppBarDefaults.topAppBarColors(
+                        containerColor = Color.Transparent,
+                        scrolledContainerColor = Color.Transparent
+                    )
+                )
+            }
+        }
+
+        if (content3Visibility != null) {
+            DefaultTransition(visible = content3Visibility) {
+                TopAppBar(
+                    navigationIcon = content3NavigationIcon,
+                    title = content3Title,
+                    actions = content3Actions,
+                    scrollBehavior = scrollBehavior,
+                    colors = TopAppBarDefaults.topAppBarColors(
+                        containerColor = Color.Transparent,
+                        scrolledContainerColor = Color.Transparent
+                    )
+                )
+            }
+        }
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/BottomNavigationBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/BottomNavigationBar.kt
similarity index 70%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/BottomNavigationBar.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/BottomNavigationBar.kt
index bae5ecf2..b50bc246 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/BottomNavigationBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/BottomNavigationBar.kt
@@ -1,17 +1,20 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationBar
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.NavigationBarItem
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.NavigationBarItem
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.ui.elevation
 
 /**
  * Bottom navigation bar, uses default [NavigationBar].
@@ -20,7 +23,15 @@ import com.acclorite.books_history.ui.elevation
 fun BottomNavigationBar(
     navigator: Navigator
 ) {
-    val currentScreen by navigator.getCurrentScreen().collectAsState()
+    var currentScreen: Screen? by remember { mutableStateOf(null) }
+
+    LaunchedEffect(Unit) {
+        navigator.getCurrentScreen().collect {
+            if (it == Screen.LIBRARY || it == Screen.HISTORY || it == Screen.BROWSE) {
+                currentScreen = it
+            }
+        }
+    }
 
     NavigationBar(
         containerColor = MaterialTheme.elevation()
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/BottomNavigationItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/BottomNavigationItem.kt
similarity index 93%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/BottomNavigationItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/BottomNavigationItem.kt
index b4b80c79..94c8edac 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/BottomNavigationItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/BottomNavigationItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.size
@@ -11,7 +11,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.domain.model.NavigationBarItem
+import ua.acclorite.book_story.domain.model.NavigationBarItem
 
 /**
  * Bottom Navigation Bar Item, uses default [NavigationBarItem].
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/CategoryTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/CategoryTitle.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/CategoryTitle.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/CategoryTitle.kt
index 7e09177f..c553bf4c 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/CategoryTitle.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/CategoryTitle.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/CustomCheckbox.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomCheckbox.kt
similarity index 92%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/CustomCheckbox.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/CustomCheckbox.kt
index dbcf4181..addfddca 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/CustomCheckbox.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomCheckbox.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -14,7 +14,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.ui.elevation
 
 @Composable
 fun CustomCheckbox(selected: Boolean) {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/CustomDialogWithContent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDialogWithContent.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/CustomDialogWithContent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDialogWithContent.kt
index 483f573e..a7751c64 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/CustomDialogWithContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDialogWithContent.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
@@ -31,9 +31,9 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.DialogProperties
 import androidx.compose.ui.window.DialogWindowProvider
-import com.acclorite.books_history.R
-import com.acclorite.books_history.ui.ElevationDefaults
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.ui.ElevationDefaults
+import ua.acclorite.book_story.ui.elevation
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -100,6 +100,8 @@ fun CustomDialogWithContent(
                         else Alignment.Start
                     )
                     .padding(horizontal = 24.dp),
+                textAlign = if (drawableIcon != null || imageVectorIcon != null) TextAlign.Center
+                else TextAlign.Start,
                 style = MaterialTheme.typography.headlineSmall,
                 color = MaterialTheme.colorScheme.onSurface
             )
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/CustomDialogWithLazyColumn.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDialogWithLazyColumn.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/CustomDialogWithLazyColumn.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDialogWithLazyColumn.kt
index 1be5db0b..51cf8bb1 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/CustomDialogWithLazyColumn.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDialogWithLazyColumn.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
@@ -32,9 +32,9 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.DialogProperties
 import androidx.compose.ui.window.DialogWindowProvider
-import com.acclorite.books_history.R
-import com.acclorite.books_history.ui.ElevationDefaults
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.ui.ElevationDefaults
+import ua.acclorite.book_story.ui.elevation
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -101,6 +101,8 @@ fun CustomDialogWithLazyColumn(
                         else Alignment.Start
                     )
                     .padding(horizontal = 24.dp),
+                textAlign = if (drawableIcon != null || imageVectorIcon != null) TextAlign.Center
+                else TextAlign.Start,
                 style = MaterialTheme.typography.headlineSmall,
                 color = MaterialTheme.colorScheme.onSurface
             )
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/CustomDropDownMenuItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDropDownMenuItem.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/CustomDropDownMenuItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDropDownMenuItem.kt
index 91820fec..f4353a5b 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/CustomDropDownMenuItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDropDownMenuItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.size
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomSnackBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomSnackBar.kt
new file mode 100644
index 00000000..b23809c6
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomSnackBar.kt
@@ -0,0 +1,49 @@
+package ua.acclorite.book_story.presentation.components
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.DismissValue
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.SwipeToDismiss
+import androidx.compose.material.rememberDismissState
+import androidx.compose.material3.Snackbar
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+@OptIn(ExperimentalMaterialApi::class)
+@Composable
+fun CustomSnackbar(snackbarState: SnackbarHostState) {
+    val dismissState = rememberDismissState { value ->
+        if (value != DismissValue.Default) {
+            snackbarState.currentSnackbarData?.dismiss()
+            true
+        } else false
+    }
+
+    LaunchedEffect(dismissState.currentValue) {
+        if (dismissState.currentValue != DismissValue.Default) {
+            dismissState.reset()
+        }
+    }
+
+    SwipeToDismiss(
+        modifier = Modifier
+            .padding(vertical = 4.dp)
+            .fillMaxWidth(),
+        state = dismissState,
+        background = {}
+    ) {
+        SnackbarHost(
+            hostState = snackbarState,
+            snackbar = { data ->
+                Snackbar(
+                    data
+                )
+            }
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/IsEmpty.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/IsEmpty.kt
similarity index 97%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/IsEmpty.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/IsEmpty.kt
index 7db1ad53..0a4d67a5 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/IsEmpty.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/IsEmpty.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/IsError.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/IsError.kt
similarity index 97%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/IsError.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/IsError.kt
index 84f07820..61bf90b1 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/IsError.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/IsError.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/MoreDropDown.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/MoreDropDown.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/MoreDropDown.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/MoreDropDown.kt
index f1ffae65..c5cd1e4b 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/MoreDropDown.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/MoreDropDown.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
@@ -20,9 +20,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
 
 @Composable
 fun MoreDropDown(navigator: Navigator) {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/SelectableDialogItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/SelectableDialogItem.kt
similarity index 96%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/SelectableDialogItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/SelectableDialogItem.kt
index 5daf96a3..7c638013 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/SelectableDialogItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/SelectableDialogItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/data/ArithmeticOperations.kt b/app/src/main/java/ua/acclorite/book_story/presentation/data/ArithmeticOperations.kt
similarity index 83%
rename from app/src/main/java/com/acclorite/books_history/presentation/data/ArithmeticOperations.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/data/ArithmeticOperations.kt
index 132bd69f..71b426bd 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/data/ArithmeticOperations.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/data/ArithmeticOperations.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.data
+package ua.acclorite.book_story.presentation.data
 
 fun String.removeTrailingZero(): String {
     if (!this.contains('.'))
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/data/MainEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/data/MainEvent.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/presentation/data/MainEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/data/MainEvent.kt
index b58b5bc2..aa25f590 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/data/MainEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/data/MainEvent.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.data
+package ua.acclorite.book_story.presentation.data
 
 import androidx.activity.ComponentActivity
 
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/data/MainViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/data/MainViewModel.kt
similarity index 96%
rename from app/src/main/java/com/acclorite/books_history/presentation/data/MainViewModel.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/data/MainViewModel.kt
index de2d5e58..73b2fffe 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/data/MainViewModel.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/data/MainViewModel.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.data
+package ua.acclorite.book_story.presentation.data
 
 import android.os.Build
 import androidx.activity.ComponentActivity
@@ -6,15 +6,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.acclorite.books_history.domain.use_case.ChangeLanguage
-import com.acclorite.books_history.domain.use_case.GetDatastore
-import com.acclorite.books_history.domain.use_case.SetDatastore
-import com.acclorite.books_history.ui.DarkTheme
-import com.acclorite.books_history.ui.Theme
-import com.acclorite.books_history.ui.toDarkTheme
-import com.acclorite.books_history.ui.toTheme
-import com.acclorite.books_history.util.Constants
-import com.acclorite.books_history.util.DataStoreConstants
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -25,6 +16,15 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import ua.acclorite.book_story.domain.use_case.ChangeLanguage
+import ua.acclorite.book_story.domain.use_case.GetDatastore
+import ua.acclorite.book_story.domain.use_case.SetDatastore
+import ua.acclorite.book_story.ui.DarkTheme
+import ua.acclorite.book_story.ui.Theme
+import ua.acclorite.book_story.ui.toDarkTheme
+import ua.acclorite.book_story.ui.toTheme
+import ua.acclorite.book_story.util.Constants
+import ua.acclorite.book_story.util.DataStoreConstants
 import java.util.Locale
 import javax.inject.Inject
 
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/BookInfoScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/BookInfoScreen.kt
similarity index 81%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/BookInfoScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/BookInfoScreen.kt
index c4219230..140a1ce6 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/BookInfoScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/BookInfoScreen.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info
+package ua.acclorite.book_story.presentation.screens.book_info
 
 import android.widget.Toast
 import androidx.activity.ComponentActivity
@@ -33,7 +33,6 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -51,34 +50,39 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.presentation.Argument
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.presentation.screens.book_info.components.BookInfoBackground
-import com.acclorite.books_history.presentation.screens.book_info.components.BookInfoChangeCoverBottomSheet
-import com.acclorite.books_history.presentation.screens.book_info.components.BookInfoDeleteDialog
-import com.acclorite.books_history.presentation.screens.book_info.components.BookInfoDescriptionSection
-import com.acclorite.books_history.presentation.screens.book_info.components.BookInfoDetailsBottomSheet
-import com.acclorite.books_history.presentation.screens.book_info.components.BookInfoInfoSection
-import com.acclorite.books_history.presentation.screens.book_info.components.BookInfoMoreDropDown
-import com.acclorite.books_history.presentation.screens.book_info.components.BookInfoMoveDialog
-import com.acclorite.books_history.presentation.screens.book_info.components.BookInfoStatisticSection
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoEvent
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoViewModel
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
-import com.acclorite.books_history.ui.DefaultTransition
-import com.acclorite.books_history.ui.Transitions
-import com.acclorite.books_history.ui.elevation
-import com.acclorite.books_history.util.Constants
 import dagger.hilt.android.lifecycle.withCreationCallback
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.presentation.Argument
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.presentation.components.AnimatedTopAppBar
+import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoBackground
+import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoChangeCoverBottomSheet
+import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoDeleteDialog
+import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoDescriptionSection
+import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoDetailsBottomSheet
+import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoInfoSection
+import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoMoreDropDown
+import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoMoveDialog
+import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoStatisticSection
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoViewModel
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseViewModel
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryViewModel
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.ui.DefaultTransition
+import ua.acclorite.book_story.ui.Transitions
+import ua.acclorite.book_story.ui.elevation
+import ua.acclorite.book_story.util.Constants
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun BookInfoScreen(
     libraryViewModel: LibraryViewModel = hiltViewModel(),
+    browseViewModel: BrowseViewModel = hiltViewModel(),
+    historyViewModel: HistoryViewModel = hiltViewModel(),
     navigator: Navigator
 ) {
     val context = LocalContext.current
@@ -120,7 +124,11 @@ fun BookInfoScreen(
     }
 
     if (state.showChangeCoverBottomSheet) {
-        BookInfoChangeCoverBottomSheet(libraryViewModel = libraryViewModel, viewModel = viewModel)
+        BookInfoChangeCoverBottomSheet(
+            libraryViewModel = libraryViewModel,
+            historyViewModel = historyViewModel,
+            viewModel = viewModel
+        )
     }
     if (state.showDetailsBottomSheet) {
         BookInfoDetailsBottomSheet(viewModel = viewModel)
@@ -128,6 +136,8 @@ fun BookInfoScreen(
     if (state.showDeleteDialog) {
         BookInfoDeleteDialog(
             libraryViewModel = libraryViewModel,
+            browseViewModel = browseViewModel,
+            historyViewModel = historyViewModel,
             viewModel = viewModel,
             navigator = navigator
         )
@@ -147,9 +157,13 @@ fun BookInfoScreen(
             .windowInsetsPadding(WindowInsets.navigationBars),
         containerColor = MaterialTheme.colorScheme.surface,
         topBar = {
-            TopAppBar(
+            AnimatedTopAppBar(
+                containerColor = Color.Transparent,
+                scrolledContainerColor = MaterialTheme.elevation(),
                 scrollBehavior = scrollBehavior,
-                navigationIcon = {
+                isTopBarScrolled = null,
+
+                content1NavigationIcon = {
                     IconButton(onClick = {
                         navigator.navigateBack()
                     }) {
@@ -160,7 +174,7 @@ fun BookInfoScreen(
                         )
                     }
                 },
-                title = {
+                content1Title = {
                     DefaultTransition(visible = firstVisibleItemIndex > 0) {
                         Text(
                             state.book.title,
@@ -171,7 +185,7 @@ fun BookInfoScreen(
                         )
                     }
                 },
-                actions = {
+                content1Actions = {
                     Box {
                         DefaultTransition(
                             visible = !state.editTitle
@@ -214,11 +228,7 @@ fun BookInfoScreen(
                             }
                         }
                     }
-                },
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = Color.Transparent,
-                    scrolledContainerColor = MaterialTheme.elevation()
-                )
+                }
             )
         }
     ) { paddingValues ->
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoBackground.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoBackground.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoBackground.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoBackground.kt
index 0b0367fb..31d3dc3f 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoBackground.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoBackground.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.fillMaxWidth
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheet.kt
similarity index 80%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheet.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheet.kt
index 9bd6e2ff..5e6e4eca 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheet.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheet.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
@@ -22,18 +22,21 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoEvent
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoViewModel
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
-import com.acclorite.books_history.ui.ElevationDefaults
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoViewModel
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryViewModel
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.ui.ElevationDefaults
+import ua.acclorite.book_story.ui.elevation
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun BookInfoChangeCoverBottomSheet(
     libraryViewModel: LibraryViewModel,
+    historyViewModel: HistoryViewModel,
     viewModel: BookInfoViewModel
 ) {
     val state by viewModel.state.collectAsState()
@@ -50,6 +53,7 @@ fun BookInfoChangeCoverBottomSheet(
                         context,
                         refreshList = {
                             libraryViewModel.onEvent(LibraryEvent.OnLoadList)
+                            historyViewModel.onEvent(HistoryEvent.OnLoadList)
                         }
                     )
                 )
@@ -91,6 +95,7 @@ fun BookInfoChangeCoverBottomSheet(
                 viewModel.onEvent(BookInfoEvent.OnDeleteCover(
                     refreshList = {
                         libraryViewModel.onEvent(LibraryEvent.OnLoadList)
+                        historyViewModel.onEvent(HistoryEvent.OnLoadList)
                     }
                 ))
                 Toast.makeText(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheetItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheetItem.kt
similarity index 96%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheetItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheetItem.kt
index 05955650..7778d6a9 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheetItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheetItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDeleteDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDeleteDialog.kt
similarity index 52%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDeleteDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDeleteDialog.kt
index 184c4027..84921428 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDeleteDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDeleteDialog.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import android.widget.Toast
 import androidx.compose.material.icons.Icons
@@ -6,17 +6,23 @@ import androidx.compose.material.icons.outlined.DeleteOutline
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.components.CustomDialogWithContent
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoEvent
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoViewModel
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.components.CustomDialogWithContent
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoViewModel
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseViewModel
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryViewModel
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
 
 @Composable
 fun BookInfoDeleteDialog(
     libraryViewModel: LibraryViewModel,
+    browseViewModel: BrowseViewModel,
+    historyViewModel: HistoryViewModel,
     viewModel: BookInfoViewModel,
     navigator: Navigator
 ) {
@@ -37,9 +43,9 @@ fun BookInfoDeleteDialog(
                 BookInfoEvent.OnDeleteBook(
                     navigator = navigator,
                     refreshList = {
-                        libraryViewModel.onEvent(
-                            LibraryEvent.OnLoadList
-                        )
+                        libraryViewModel.onEvent(LibraryEvent.OnLoadList)
+                        browseViewModel.onEvent(BrowseEvent.OnLoadList)
+                        historyViewModel.onEvent(HistoryEvent.OnLoadList)
                     }
                 )
             )
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDescriptionSection.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDescriptionSection.kt
similarity index 85%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDescriptionSection.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDescriptionSection.kt
index d61f2601..f4f4ab4b 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDescriptionSection.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDescriptionSection.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
@@ -11,8 +11,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
 
 @Composable
 fun BookInfoDescriptionSection(book: Book) {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDetailsBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDetailsBottomSheet.kt
similarity index 92%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDetailsBottomSheet.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDetailsBottomSheet.kt
index 6595badc..6a460b8a 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDetailsBottomSheet.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDetailsBottomSheet.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import android.widget.Toast
 import androidx.compose.foundation.layout.Spacer
@@ -16,11 +16,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoEvent
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoViewModel
-import com.acclorite.books_history.ui.ElevationDefaults
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoViewModel
+import ua.acclorite.book_story.ui.ElevationDefaults
+import ua.acclorite.book_story.ui.elevation
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDetailsBottomSheetItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDetailsBottomSheetItem.kt
similarity index 96%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDetailsBottomSheetItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDetailsBottomSheetItem.kt
index 422702e3..662ff4d3 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDetailsBottomSheetItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDetailsBottomSheetItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.combinedClickable
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoInfoSection.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoInfoSection.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoInfoSection.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoInfoSection.kt
index 9b3d61b1..61c385a9 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoInfoSection.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoInfoSection.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
@@ -41,10 +41,10 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoEvent
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoViewModel
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoViewModel
+import ua.acclorite.book_story.ui.elevation
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
@@ -117,8 +117,8 @@ fun BookInfoInfoSection(viewModel: BookInfoViewModel, book: Book) {
                 )
             } else {
                 BasicTextField(
+                    maxLines = 4,
                     value = state.titleValue,
-                    singleLine = true,
                     textStyle = TextStyle(
                         color = MaterialTheme.colorScheme.onSurface,
                         fontSize = MaterialTheme.typography.headlineSmall.fontSize,
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoMoreDropDown.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoreDropDown.kt
similarity index 87%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoMoreDropDown.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoreDropDown.kt
index 23e0be2c..756cac9e 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoMoreDropDown.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoreDropDown.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.size
@@ -18,10 +18,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.components.CustomDropDownMenuItem
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoEvent
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.components.CustomDropDownMenuItem
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoViewModel
 
 @Composable
 fun BookInfoMoreDropDown(viewModel: BookInfoViewModel) {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoMoveDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoveDialog.kt
similarity index 78%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoMoveDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoveDialog.kt
index 2192b83e..92411f5d 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoMoveDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoveDialog.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import android.widget.Toast
 import androidx.compose.foundation.lazy.items
@@ -11,15 +11,15 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.components.CustomDialogWithLazyColumn
-import com.acclorite.books_history.presentation.components.SelectableDialogItem
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoEvent
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoViewModel
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.components.CustomDialogWithLazyColumn
+import ua.acclorite.book_story.presentation.components.SelectableDialogItem
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoViewModel
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
 
 @Composable
 fun BookInfoMoveDialog(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoStatisticSection.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoStatisticSection.kt
similarity index 87%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoStatisticSection.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoStatisticSection.kt
index 44dd912e..a08305bb 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoStatisticSection.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoStatisticSection.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -14,10 +14,10 @@ import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.presentation.data.removeDigits
-import com.acclorite.books_history.presentation.data.removeTrailingZero
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.presentation.data.removeDigits
+import ua.acclorite.book_story.presentation.data.removeTrailingZero
 
 @Composable
 fun BookInfoStatisticSection(book: Book) {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/data/BookInfoEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoEvent.kt
similarity index 88%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/data/BookInfoEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoEvent.kt
index 30d17975..dce99736 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/data/BookInfoEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoEvent.kt
@@ -1,10 +1,10 @@
-package com.acclorite.books_history.presentation.screens.book_info.data
+package ua.acclorite.book_story.presentation.screens.book_info.data
 
 import android.content.Context
 import android.net.Uri
 import androidx.compose.ui.focus.FocusRequester
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.presentation.Navigator
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.presentation.Navigator
 
 sealed class BookInfoEvent {
     data object OnShowHideChangeCoverBottomSheet : BookInfoEvent()
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/data/BookInfoState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoState.kt
similarity index 73%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/data/BookInfoState.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoState.kt
index e0469897..7c580f2b 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/data/BookInfoState.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoState.kt
@@ -1,8 +1,8 @@
-package com.acclorite.books_history.presentation.screens.book_info.data
+package ua.acclorite.book_story.presentation.screens.book_info.data
 
 import androidx.compose.runtime.Immutable
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
 
 @Immutable
 data class BookInfoState(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/data/BookInfoViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoViewModel.kt
similarity index 93%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/data/BookInfoViewModel.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoViewModel.kt
index 0cfdf7d7..559cd40b 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/data/BookInfoViewModel.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoViewModel.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.data
+package ua.acclorite.book_story.presentation.screens.book_info.data
 
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -7,12 +7,6 @@ import android.graphics.BitmapFactory
 import android.os.Build
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.domain.use_case.DeleteBooks
-import com.acclorite.books_history.domain.use_case.UpdateBooks
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -22,6 +16,12 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.domain.use_case.DeleteBooks
+import ua.acclorite.book_story.domain.use_case.UpdateBooks
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
 
 
 @HiltViewModel(assistedFactory = BookInfoViewModel.Factory::class)
@@ -134,9 +134,11 @@ class BookInfoViewModel @AssistedInject constructor(
 
             is BookInfoEvent.OnUpdateTitle -> {
                 viewModelScope.launch {
+                    val title = _state.value.titleValue.trim().replace("\n", "")
+
                     updateBooks.execute(
                         listOf(
-                            _state.value.book.copy(title = _state.value.titleValue.trim())
+                            _state.value.book.copy(title = title)
                         )
                     )
                     event.refreshList()
@@ -144,7 +146,7 @@ class BookInfoViewModel @AssistedInject constructor(
                     _state.update {
                         it.copy(
                             book = it.book.copy(
-                                title = it.titleValue
+                                title = title
                             )
                         )
                     }
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/BrowseScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/BrowseScreen.kt
similarity index 90%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/browse/BrowseScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/BrowseScreen.kt
index d57f276f..ca5d96ab 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/BrowseScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/BrowseScreen.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.browse
+package ua.acclorite.book_story.presentation.screens.browse
 
 import android.Manifest
 import androidx.activity.compose.BackHandler
@@ -54,26 +54,26 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.presentation.components.AnimatedTopAppBar
-import com.acclorite.books_history.presentation.components.IsEmpty
-import com.acclorite.books_history.presentation.components.IsError
-import com.acclorite.books_history.presentation.components.MoreDropDown
-import com.acclorite.books_history.presentation.screens.browse.components.BrowseAddingDialog
-import com.acclorite.books_history.presentation.screens.browse.components.BrowseFileItem
-import com.acclorite.books_history.presentation.screens.browse.components.BrowseStoragePermissionDialog
-import com.acclorite.books_history.presentation.screens.browse.data.BrowseEvent
-import com.acclorite.books_history.presentation.screens.browse.data.BrowseViewModel
-import com.acclorite.books_history.ui.DefaultTransition
-import com.acclorite.books_history.ui.Transitions
-import com.acclorite.books_history.ui.elevation
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.rememberPermissionState
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.debounce
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.presentation.components.AnimatedTopAppBar
+import ua.acclorite.book_story.presentation.components.IsEmpty
+import ua.acclorite.book_story.presentation.components.IsError
+import ua.acclorite.book_story.presentation.components.MoreDropDown
+import ua.acclorite.book_story.presentation.screens.browse.components.BrowseAddingDialog
+import ua.acclorite.book_story.presentation.screens.browse.components.BrowseFileItem
+import ua.acclorite.book_story.presentation.screens.browse.components.BrowseStoragePermissionDialog
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseViewModel
+import ua.acclorite.book_story.ui.DefaultTransition
+import ua.acclorite.book_story.ui.Transitions
+import ua.acclorite.book_story.ui.elevation
 
 @OptIn(
     ExperimentalMaterial3Api::class,
@@ -114,7 +114,9 @@ fun BrowseScreen(
         }
             .debounce(10L)
             .collectLatest {
-                viewModel.onEvent(BrowseEvent.OnUpdateScrollOffset(it))
+                viewModel.onEvent(
+                    BrowseEvent.OnUpdateScrollOffset(it)
+                )
             }
     }
     LaunchedEffect(Unit) {
@@ -266,7 +268,7 @@ fun BrowseScreen(
                 modifier = Modifier
                     .fillMaxSize(),
                 columns = GridCells.Adaptive(170.dp),
-                contentPadding = PaddingValues(10.dp)
+                contentPadding = PaddingValues(12.dp)
             ) {
                 items(state.selectableFiles, key = { it.first.path }) { selectableFile ->
                     BrowseFileItem(
@@ -305,7 +307,8 @@ fun BrowseScreen(
 
             AnimatedVisibility(
                 visible = !state.isLoading && state.selectableFiles.isEmpty()
-                        && !state.showErrorMessage && !state.requestPermissionDialog,
+                        && !state.showErrorMessage && !state.requestPermissionDialog
+                        && !state.isRefreshing,
                 modifier = Modifier.align(Alignment.Center),
                 enter = Transitions.DefaultTransitionIn,
                 exit = fadeOut(tween(0))
@@ -332,11 +335,15 @@ fun BrowseScreen(
     BackHandler {
         if (state.hasSelectedItems) {
             viewModel.onEvent(BrowseEvent.OnClearSelectedFiles)
-        } else if (state.showSearch) {
-            viewModel.onEvent(BrowseEvent.OnSearchShowHide)
-        } else {
-            navigator.navigate(Screen.LIBRARY)
+            return@BackHandler
         }
+
+        if (state.showSearch) {
+            viewModel.onEvent(BrowseEvent.OnSearchShowHide)
+            return@BackHandler
+        }
+
+        navigator.navigate(Screen.LIBRARY)
     }
 }
 
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseAddingDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseAddingDialog.kt
similarity index 81%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseAddingDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseAddingDialog.kt
index 219dfd1f..92cef92b 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseAddingDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseAddingDialog.kt
@@ -1,89 +1,89 @@
-package com.acclorite.books_history.presentation.screens.browse.components
-
-import android.widget.Toast
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.AddChart
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.StrokeCap
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.components.CustomDialogWithLazyColumn
-import com.acclorite.books_history.presentation.screens.browse.data.BrowseEvent
-import com.acclorite.books_history.presentation.screens.browse.data.BrowseViewModel
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
-
-@Composable
-fun BrowseAddingDialog(
-    libraryViewModel: LibraryViewModel = hiltViewModel(),
-    viewModel: BrowseViewModel,
-    navigator: Navigator
-) {
-    val state by viewModel.state.collectAsState()
-    val context = LocalContext.current
-
-    CustomDialogWithLazyColumn(
-        title = stringResource(id = R.string.add_books),
-        imageVectorIcon = Icons.Default.AddChart,
-        description = stringResource(id = R.string.add_books_description),
-        actionText = stringResource(id = R.string.add),
-        isActionEnabled = !state.isBooksLoading,
-        onDismiss = { viewModel.onEvent(BrowseEvent.OnAddingDialogDismiss) },
-        onAction = {
-            viewModel.onEvent(
-                BrowseEvent.OnAddBooks(
-                    navigator,
-                    resetScroll = {
-                        libraryViewModel.onEvent(LibraryEvent.OnUpdateCurrentPage(0))
-                    }
-                )
-            )
-            Toast.makeText(
-                context,
-                context.getString(R.string.books_added),
-                Toast.LENGTH_LONG
-            ).show()
-        },
-        withDivider = true,
-        items = {
-            if (state.isBooksLoading) {
-                item {
-                    Box(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(top = 16.dp)
-                    ) {
-                        CircularProgressIndicator(
-                            color = MaterialTheme.colorScheme.primary,
-                            strokeCap = StrokeCap.Round,
-                            modifier = Modifier
-                                .align(Alignment.Center)
-                                .size(36.dp)
-                        )
-                    }
-                }
-            } else {
-                items(state.selectedBooks) { book ->
-                    BrowseAddingDialogItem(result = book) {
-                        viewModel.onEvent(BrowseEvent.OnSelectBook(book))
-                    }
-                }
-            }
-        }
-    )
+package ua.acclorite.book_story.presentation.screens.browse.components
+
+import android.widget.Toast
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.CircularProgressIndicator
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AddChart
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.components.CustomDialogWithLazyColumn
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseViewModel
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
+
+@Composable
+fun BrowseAddingDialog(
+    libraryViewModel: LibraryViewModel = hiltViewModel(),
+    viewModel: BrowseViewModel,
+    navigator: Navigator
+) {
+    val state by viewModel.state.collectAsState()
+    val context = LocalContext.current
+
+    CustomDialogWithLazyColumn(
+        title = stringResource(id = R.string.add_books),
+        imageVectorIcon = Icons.Default.AddChart,
+        description = stringResource(id = R.string.add_books_description),
+        actionText = stringResource(id = R.string.add),
+        isActionEnabled = !state.isBooksLoading,
+        onDismiss = { viewModel.onEvent(BrowseEvent.OnAddingDialogDismiss) },
+        onAction = {
+            viewModel.onEvent(
+                BrowseEvent.OnAddBooks(
+                    navigator,
+                    resetScroll = {
+                        libraryViewModel.onEvent(LibraryEvent.OnUpdateCurrentPage(0))
+                    }
+                )
+            )
+            Toast.makeText(
+                context,
+                context.getString(R.string.books_added),
+                Toast.LENGTH_LONG
+            ).show()
+        },
+        withDivider = true,
+        items = {
+            if (state.isBooksLoading) {
+                item {
+                    Box(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(top = 16.dp)
+                    ) {
+                        CircularProgressIndicator(
+                            color = MaterialTheme.colorScheme.primary,
+                            strokeCap = StrokeCap.Round,
+                            modifier = Modifier
+                                .align(Alignment.Center)
+                                .size(36.dp)
+                        )
+                    }
+                }
+            } else {
+                items(state.selectedBooks) { book ->
+                    BrowseAddingDialogItem(result = book) {
+                        viewModel.onEvent(BrowseEvent.OnSelectBook(book))
+                    }
+                }
+            }
+        }
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseAddingDialogItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseAddingDialogItem.kt
similarity index 93%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseAddingDialogItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseAddingDialogItem.kt
index 6edd40dc..55776d10 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseAddingDialogItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseAddingDialogItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.browse.components
+package ua.acclorite.book_story.presentation.screens.browse.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
@@ -19,8 +19,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.domain.model.NullableBook
-import com.acclorite.books_history.presentation.components.CustomCheckbox
+import ua.acclorite.book_story.domain.model.NullableBook
+import ua.acclorite.book_story.presentation.components.CustomCheckbox
 
 @Composable
 fun BrowseAddingDialogItem(result: NullableBook, onClick: () -> Unit) {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseFIleItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseFIleItem.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseFIleItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseFIleItem.kt
index 5565fa17..fd538230 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseFIleItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseFIleItem.kt
@@ -1,147 +1,147 @@
-package com.acclorite.books_history.presentation.screens.browse.components
-
-import androidx.compose.animation.animateColorAsState
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.CheckCircle
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.ui.DefaultTransition
-import java.io.File
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-
-@Composable
-fun BrowseFileItem(file: Pair<File, Boolean>, modifier: Modifier, onClick: () -> Unit) {
-    val fileExtension: String = file.first.name.substringAfterLast(".", "")
-
-    val pattern = SimpleDateFormat("HH:mm dd MMM", Locale.getDefault())
-
-    val lastModified = pattern.format(Date(file.first.lastModified()))
-    val icon = when (fileExtension) {
-        "txt" -> painterResource(id = R.drawable.txt)
-        "epub" -> painterResource(id = R.drawable.epub)
-        "pdf" -> painterResource(id = R.drawable.pdf)
-        else -> painterResource(id = R.drawable.file)
-    }
-    val outlineColor = if (file.second) MaterialTheme.colorScheme.primary
-    else MaterialTheme.colorScheme.outlineVariant
-    val backgroundColor = if (file.second) MaterialTheme.colorScheme.secondaryContainer
-    else Color.Transparent
-
-    val animatedOutlineColor by animateColorAsState(
-        targetValue = outlineColor,
-        tween(300),
-        label = "Outline animation"
-    )
-    val animatedBackgroundColor by animateColorAsState(
-        targetValue = backgroundColor,
-        tween(300),
-        label = "Background animation"
-    )
-
-    Column(
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally,
-        modifier = modifier
-            .padding(6.dp)
-            .clip(MaterialTheme.shapes.medium)
-            .border(
-                width = 1.dp,
-                color = animatedOutlineColor,
-                shape = MaterialTheme.shapes.medium
-            )
-            .padding(1.dp)
-            .background(animatedBackgroundColor)
-            .clickable {
-                onClick()
-            }
-    ) {
-        Icon(
-            painter = icon,
-            contentDescription = "File icon",
-            modifier = Modifier
-                .padding(vertical = 60.dp)
-                .size(70.dp),
-            tint = MaterialTheme.colorScheme.onSurfaceVariant
-        )
-        Row(
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.Start,
-            modifier = Modifier
-                .background(MaterialTheme.colorScheme.surface)
-                .padding(horizontal = 10.dp, vertical = 12.dp)
-        ) {
-            Box {
-                DefaultTransition(visible = !file.second) {
-                    Icon(
-                        painter = painterResource(R.drawable.file),
-                        contentDescription = "File",
-                        modifier = Modifier
-                            .size(28.dp),
-                        tint = MaterialTheme.colorScheme.onSurfaceVariant
-                    )
-                }
-                DefaultTransition(visible = file.second) {
-                    Icon(
-                        imageVector = Icons.Filled.CheckCircle,
-                        contentDescription = "Checked",
-                        modifier = Modifier
-                            .size(28.dp),
-                        tint = MaterialTheme.colorScheme.primary
-                    )
-                }
-            }
-            Spacer(modifier = Modifier.width(8.dp))
-            Column(
-                verticalArrangement = Arrangement.Center
-            ) {
-                Text(
-                    file.first.name,
-                    color = MaterialTheme.colorScheme.onSurface,
-                    style = MaterialTheme.typography.labelMedium,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                    modifier = Modifier.fillMaxWidth()
-                )
-                Spacer(modifier = Modifier.height(2.dp))
-                Text(
-                    lastModified,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    style = MaterialTheme.typography.bodySmall,
-                    fontSize = 11.sp,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                    modifier = Modifier.fillMaxWidth()
-                )
-            }
-
-        }
-    }
+package ua.acclorite.book_story.presentation.screens.browse.components
+
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.ui.DefaultTransition
+import java.io.File
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+@Composable
+fun BrowseFileItem(file: Pair<File, Boolean>, modifier: Modifier, onClick: () -> Unit) {
+    val fileExtension: String = file.first.name.substringAfterLast(".", "")
+
+    val pattern = SimpleDateFormat("HH:mm dd MMM", Locale.getDefault())
+
+    val lastModified = pattern.format(Date(file.first.lastModified()))
+    val icon = when (fileExtension) {
+        "txt" -> painterResource(id = R.drawable.txt)
+        "epub" -> painterResource(id = R.drawable.epub)
+        "pdf" -> painterResource(id = R.drawable.pdf)
+        else -> painterResource(id = R.drawable.file)
+    }
+    val outlineColor = if (file.second) MaterialTheme.colorScheme.primary
+    else MaterialTheme.colorScheme.outlineVariant
+    val backgroundColor = if (file.second) MaterialTheme.colorScheme.secondaryContainer
+    else Color.Transparent
+
+    val animatedOutlineColor by animateColorAsState(
+        targetValue = outlineColor,
+        tween(300),
+        label = "Outline animation"
+    )
+    val animatedBackgroundColor by animateColorAsState(
+        targetValue = backgroundColor,
+        tween(300),
+        label = "Background animation"
+    )
+
+    Column(
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = modifier
+            .padding(6.dp)
+            .clip(MaterialTheme.shapes.medium)
+            .border(
+                width = 1.dp,
+                color = animatedOutlineColor,
+                shape = MaterialTheme.shapes.medium
+            )
+            .padding(1.dp)
+            .background(animatedBackgroundColor)
+            .clickable {
+                onClick()
+            }
+    ) {
+        Icon(
+            painter = icon,
+            contentDescription = "File icon",
+            modifier = Modifier
+                .padding(vertical = 60.dp)
+                .size(70.dp),
+            tint = MaterialTheme.colorScheme.onSurfaceVariant
+        )
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.Start,
+            modifier = Modifier
+                .background(MaterialTheme.colorScheme.surface)
+                .padding(horizontal = 10.dp, vertical = 12.dp)
+        ) {
+            Box {
+                DefaultTransition(visible = !file.second) {
+                    Icon(
+                        painter = painterResource(R.drawable.file),
+                        contentDescription = "File",
+                        modifier = Modifier
+                            .size(28.dp),
+                        tint = MaterialTheme.colorScheme.onSurfaceVariant
+                    )
+                }
+                DefaultTransition(visible = file.second) {
+                    Icon(
+                        imageVector = Icons.Filled.CheckCircle,
+                        contentDescription = "Checked",
+                        modifier = Modifier
+                            .size(28.dp),
+                        tint = MaterialTheme.colorScheme.primary
+                    )
+                }
+            }
+            Spacer(modifier = Modifier.width(8.dp))
+            Column(
+                verticalArrangement = Arrangement.Center
+            ) {
+                Text(
+                    file.first.name,
+                    color = MaterialTheme.colorScheme.onSurface,
+                    style = MaterialTheme.typography.labelMedium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    modifier = Modifier.fillMaxWidth()
+                )
+                Spacer(modifier = Modifier.height(2.dp))
+                Text(
+                    lastModified,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    style = MaterialTheme.typography.bodySmall,
+                    fontSize = 11.sp,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    modifier = Modifier.fillMaxWidth()
+                )
+            }
+
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseStoragePermissionDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseStoragePermissionDialog.kt
similarity index 78%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseStoragePermissionDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseStoragePermissionDialog.kt
index a88a8902..2dddfea9 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseStoragePermissionDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseStoragePermissionDialog.kt
@@ -1,40 +1,40 @@
-package com.acclorite.books_history.presentation.screens.browse.components
-
-import android.os.Build
-import androidx.activity.ComponentActivity
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.SdStorage
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.components.CustomDialogWithContent
-import com.acclorite.books_history.presentation.screens.browse.data.BrowseEvent
-import com.acclorite.books_history.presentation.screens.browse.data.BrowseViewModel
-import com.google.accompanist.permissions.ExperimentalPermissionsApi
-import com.google.accompanist.permissions.PermissionState
-
-@OptIn(ExperimentalPermissionsApi::class)
-@Composable
-fun BrowseStoragePermissionDialog(viewModel: BrowseViewModel, permissionState: PermissionState) {
-    val activity = LocalContext.current as ComponentActivity
-
-    CustomDialogWithContent(
-        title = stringResource(id = R.string.storage_permission),
-        description = stringResource(id = R.string.storage_permission_description),
-        actionText = stringResource(id = R.string.grant),
-        imageVectorIcon = Icons.Default.SdStorage,
-        onDismiss = { viewModel.onEvent(BrowseEvent.OnStoragePermissionDismiss(permissionState)) },
-        isActionEnabled = true,
-        withDivider = false,
-        onAction = {
-            viewModel.onEvent(
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                    BrowseEvent.OnStoragePermissionRequest(activity)
-                } else {
-                    BrowseEvent.OnLegacyStoragePermissionRequest(permissionState)
-                }
-            )
-        }
-    )
+package ua.acclorite.book_story.presentation.screens.browse.components
+
+import android.os.Build
+import androidx.activity.ComponentActivity
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.SdStorage
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.PermissionState
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.components.CustomDialogWithContent
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseViewModel
+
+@OptIn(ExperimentalPermissionsApi::class)
+@Composable
+fun BrowseStoragePermissionDialog(viewModel: BrowseViewModel, permissionState: PermissionState) {
+    val activity = LocalContext.current as ComponentActivity
+
+    CustomDialogWithContent(
+        title = stringResource(id = R.string.storage_permission),
+        description = stringResource(id = R.string.storage_permission_description),
+        actionText = stringResource(id = R.string.grant),
+        imageVectorIcon = Icons.Default.SdStorage,
+        onDismiss = { viewModel.onEvent(BrowseEvent.OnStoragePermissionDismiss(permissionState)) },
+        isActionEnabled = true,
+        withDivider = false,
+        onAction = {
+            viewModel.onEvent(
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    BrowseEvent.OnStoragePermissionRequest(activity)
+                } else {
+                    BrowseEvent.OnLegacyStoragePermissionRequest(permissionState)
+                }
+            )
+        }
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/data/BrowseEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseEvent.kt
similarity index 87%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/browse/data/BrowseEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseEvent.kt
index e5939ae7..c5ca39a8 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/data/BrowseEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseEvent.kt
@@ -1,37 +1,36 @@
-@file:OptIn(ExperimentalPermissionsApi::class)
-
-package com.acclorite.books_history.presentation.screens.browse.data
-
-import androidx.activity.ComponentActivity
-import androidx.compose.ui.focus.FocusRequester
-import com.acclorite.books_history.domain.model.NullableBook
-import com.acclorite.books_history.presentation.Navigator
-import com.google.accompanist.permissions.ExperimentalPermissionsApi
-import com.google.accompanist.permissions.PermissionState
-import java.io.File
-
-sealed class BrowseEvent {
-    data class OnStoragePermissionRequest(val activity: ComponentActivity) : BrowseEvent()
-    data class OnLegacyStoragePermissionRequest(val permissionState: PermissionState) :
-        BrowseEvent()
-
-    data class OnStoragePermissionDismiss(val permissionState: PermissionState) : BrowseEvent()
-    data object OnRefreshList : BrowseEvent()
-    data class OnPermissionCheck(val permissionState: PermissionState) : BrowseEvent()
-    data class OnSelectFile(val file: Pair<File, Boolean>) : BrowseEvent()
-    data class OnSelectBook(val book: NullableBook) : BrowseEvent()
-    data object OnSearchShowHide : BrowseEvent()
-    data class OnRequestFocus(val focusRequester: FocusRequester) : BrowseEvent()
-
-    data object OnClearSelectedFiles : BrowseEvent()
-    data class OnSearchQueryChange(val query: String) : BrowseEvent()
-    data object OnAddingDialogRequest : BrowseEvent()
-    data object OnAddingDialogDismiss : BrowseEvent()
-    data object OnGetBooksFromFiles : BrowseEvent()
-    data class OnAddBooks(val navigator: Navigator, val resetScroll: () -> Unit) : BrowseEvent()
-    data object OnLoadList : BrowseEvent()
-    data class OnUpdateScrollIndex(val index: Int) : BrowseEvent()
-    data class OnUpdateScrollOffset(val offset: Int) : BrowseEvent()
-
-
+@file:OptIn(ExperimentalPermissionsApi::class)
+
+package ua.acclorite.book_story.presentation.screens.browse.data
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.focus.FocusRequester
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.PermissionState
+import ua.acclorite.book_story.domain.model.NullableBook
+import ua.acclorite.book_story.presentation.Navigator
+import java.io.File
+
+sealed class BrowseEvent {
+    data class OnStoragePermissionRequest(val activity: ComponentActivity) : BrowseEvent()
+    data class OnLegacyStoragePermissionRequest(val permissionState: PermissionState) :
+        BrowseEvent()
+
+    data class OnStoragePermissionDismiss(val permissionState: PermissionState) : BrowseEvent()
+    data object OnRefreshList : BrowseEvent()
+    data class OnPermissionCheck(val permissionState: PermissionState) : BrowseEvent()
+    data class OnSelectFile(val file: Pair<File, Boolean>) : BrowseEvent()
+    data class OnSelectBook(val book: NullableBook) : BrowseEvent()
+    data object OnSearchShowHide : BrowseEvent()
+    data class OnRequestFocus(val focusRequester: FocusRequester) : BrowseEvent()
+    data object OnClearSelectedFiles : BrowseEvent()
+    data class OnSearchQueryChange(val query: String) : BrowseEvent()
+    data object OnAddingDialogRequest : BrowseEvent()
+    data object OnAddingDialogDismiss : BrowseEvent()
+    data object OnGetBooksFromFiles : BrowseEvent()
+    data class OnAddBooks(val navigator: Navigator, val resetScroll: () -> Unit) : BrowseEvent()
+    data object OnLoadList : BrowseEvent()
+    data class OnUpdateScrollIndex(val index: Int) : BrowseEvent()
+    data class OnUpdateScrollOffset(val offset: Int) : BrowseEvent()
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/data/BrowseState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseState.kt
similarity index 82%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/browse/data/BrowseState.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseState.kt
index a4a59347..12ad5af7 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/data/BrowseState.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseState.kt
@@ -1,28 +1,28 @@
-package com.acclorite.books_history.presentation.screens.browse.data
-
-import androidx.compose.runtime.Immutable
-import com.acclorite.books_history.domain.model.NullableBook
-import java.io.File
-
-@Immutable
-data class BrowseState(
-    val selectableFiles: List<Pair<File, Boolean>> = emptyList(),
-    val isLoading: Boolean = true,
-    val isRefreshing: Boolean = false,
-    val requestPermissionDialog: Boolean = false,
-    val showErrorMessage: Boolean = false,
-
-    val selectedItemsCount: Int = 0,
-    val hasSelectedItems: Boolean = false,
-
-    val scrollIndex: Int = 0,
-    val scrollOffset: Int = 0,
-
-    val showSearch: Boolean = false,
-    val searchQuery: String = "",
-    val hasFocused: Boolean = false,
-
-    val showAddingDialog: Boolean = false,
-    val selectedBooks: List<NullableBook> = emptyList(),
-    val isBooksLoading: Boolean = false
+package ua.acclorite.book_story.presentation.screens.browse.data
+
+import androidx.compose.runtime.Immutable
+import ua.acclorite.book_story.domain.model.NullableBook
+import java.io.File
+
+@Immutable
+data class BrowseState(
+    val selectableFiles: List<Pair<File, Boolean>> = emptyList(),
+    val isLoading: Boolean = true,
+    val isRefreshing: Boolean = false,
+    val requestPermissionDialog: Boolean = false,
+    val showErrorMessage: Boolean = false,
+
+    val selectedItemsCount: Int = 0,
+    val hasSelectedItems: Boolean = false,
+
+    val scrollIndex: Int = 0,
+    val scrollOffset: Int = 0,
+
+    val showSearch: Boolean = false,
+    val searchQuery: String = "",
+    val hasFocused: Boolean = false,
+
+    val showAddingDialog: Boolean = false,
+    val selectedBooks: List<NullableBook> = emptyList(),
+    val isBooksLoading: Boolean = false
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/data/BrowseViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseViewModel.kt
similarity index 91%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/browse/data/BrowseViewModel.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseViewModel.kt
index 5bc95fae..62db5c49 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/data/BrowseViewModel.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseViewModel.kt
@@ -1,385 +1,386 @@
-package com.acclorite.books_history.presentation.screens.browse.data
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import android.os.Environment
-import android.provider.Settings
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.acclorite.books_history.domain.model.NullableBook
-import com.acclorite.books_history.domain.use_case.FastGetBooks
-import com.acclorite.books_history.domain.use_case.GetBooksFromFiles
-import com.acclorite.books_history.domain.use_case.GetFilesFromDownloads
-import com.acclorite.books_history.domain.use_case.InsertBooks
-import com.acclorite.books_history.presentation.Argument
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.util.Resource
-import com.google.accompanist.permissions.ExperimentalPermissionsApi
-import com.google.accompanist.permissions.isGranted
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@OptIn(ExperimentalPermissionsApi::class)
-@HiltViewModel
-class BrowseViewModel @Inject constructor(
-    private val getBooksFromFiles: GetBooksFromFiles,
-    private val getFilesFromDownloads: GetFilesFromDownloads,
-    private val insertBooks: InsertBooks,
-    private val fastGetBooks: FastGetBooks
-) : ViewModel() {
-
-    private val _state = MutableStateFlow(BrowseState())
-    val state = _state.asStateFlow()
-
-    private var job: Job? = null
-
-    init {
-        onEvent(BrowseEvent.OnLoadList)
-    }
-
-    fun onEvent(event: BrowseEvent) {
-        when (event) {
-            is BrowseEvent.OnLegacyStoragePermissionRequest -> {
-                event.permissionState.launchPermissionRequest()
-
-                viewModelScope.launch {
-                    for (i in 0 until 100) {
-                        if (!event.permissionState.status.isGranted) {
-                            delay(100)
-                            continue
-                        }
-                        _state.update {
-                            it.copy(
-                                requestPermissionDialog = false,
-                                showErrorMessage = false
-                            )
-                        }
-                        onEvent(BrowseEvent.OnRefreshList)
-                        break
-                    }
-                }
-            }
-
-            is BrowseEvent.OnStoragePermissionRequest -> {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-
-                    val uri = Uri.parse("package:${event.activity.packageName}")
-                    val intent = Intent(
-                        Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION,
-                        uri
-                    )
-                    event.activity.startActivity(intent)
-
-                    viewModelScope.launch {
-                        for (i in 0 until 20) {
-                            if (!Environment.isExternalStorageManager()) {
-                                delay(1000)
-                                continue
-                            }
-                            _state.update {
-                                it.copy(
-                                    requestPermissionDialog = false,
-                                    showErrorMessage = false
-                                )
-                            }
-                            onEvent(BrowseEvent.OnRefreshList)
-                            break
-                        }
-                    }
-                }
-            }
-
-            is BrowseEvent.OnStoragePermissionDismiss -> {
-                val legacyPermission = Build.VERSION.SDK_INT < Build.VERSION_CODES.R
-                val isPermissionGranted =
-                    if (!legacyPermission) Environment.isExternalStorageManager()
-                    else event.permissionState.status.isGranted
-
-                _state.update {
-                    it.copy(
-                        requestPermissionDialog = false,
-                        showErrorMessage = !isPermissionGranted
-                    )
-                }
-
-                if (isPermissionGranted) {
-                    viewModelScope.launch(Dispatchers.IO) {
-                        getFilesFromDownloads()
-                    }
-                }
-
-            }
-
-            is BrowseEvent.OnRefreshList -> {
-                viewModelScope.launch(Dispatchers.IO) {
-                    _state.update {
-                        it.copy(
-                            isRefreshing = true,
-                            selectedItemsCount = 0,
-                            hasSelectedItems = false,
-                            showSearch = false,
-                            selectableFiles = emptyList()
-                        )
-                    }
-
-                    getFilesFromDownloads("")
-                    delay(1000)
-                    _state.update {
-                        it.copy(
-                            isRefreshing = false
-                        )
-                    }
-                }
-            }
-
-            is BrowseEvent.OnPermissionCheck -> {
-                val legacyPermission = Build.VERSION.SDK_INT < Build.VERSION_CODES.R
-                val isPermissionGranted =
-                    if (!legacyPermission) Environment.isExternalStorageManager()
-                    else event.permissionState.status.isGranted
-
-                if (isPermissionGranted) {
-                    return
-                }
-                _state.update {
-                    it.copy(
-                        requestPermissionDialog = true,
-                        showErrorMessage = false
-                    )
-                }
-            }
-
-            is BrowseEvent.OnSelectFile -> {
-                val indexOfFile = _state.value.selectableFiles.indexOf(event.file)
-                val editedList = _state.value.selectableFiles.toMutableList()
-                editedList[indexOfFile] = editedList[indexOfFile].copy(
-                    second = !editedList[indexOfFile].second
-                )
-
-                _state.update {
-                    it.copy(
-                        selectableFiles = editedList.toList(),
-                        selectedItemsCount = editedList.filter { file -> file.second }.size,
-                        hasSelectedItems = editedList.any { file -> file.second }
-                    )
-                }
-            }
-
-            is BrowseEvent.OnSelectBook -> {
-                val indexOfFile = _state.value.selectedBooks.indexOf(event.book)
-                val editedList = _state.value.selectedBooks.toMutableList()
-                editedList[indexOfFile] = NullableBook.NotNull(
-                    editedList[indexOfFile].book!!.copy(
-                        second = !editedList[indexOfFile].book!!.second
-                    )
-                )
-
-                if (!editedList.any { it.book?.second == true }) {
-                    return
-                }
-
-                _state.update {
-                    it.copy(
-                        selectedBooks = editedList
-                    )
-                }
-            }
-
-            is BrowseEvent.OnSearchShowHide -> {
-                viewModelScope.launch(Dispatchers.IO) {
-                    val shouldHide = _state.value.showSearch
-
-                    if (shouldHide) {
-                        getFilesFromDownloads("")
-                    } else {
-                        _state.update {
-                            it.copy(
-                                searchQuery = "",
-                                hasFocused = false
-                            )
-                        }
-                    }
-                    _state.update {
-                        it.copy(
-                            showSearch = !shouldHide
-                        )
-                    }
-                }
-            }
-
-            is BrowseEvent.OnRequestFocus -> {
-                if (!_state.value.hasFocused) {
-                    event.focusRequester.requestFocus()
-                    _state.update {
-                        it.copy(
-                            hasFocused = true
-                        )
-                    }
-                }
-            }
-
-            is BrowseEvent.OnClearSelectedFiles -> {
-                viewModelScope.launch(Dispatchers.IO) {
-                    _state.update {
-                        it.copy(
-                            selectableFiles = it.selectableFiles.map { file -> file.copy(second = false) },
-                            hasSelectedItems = false
-                        )
-                    }
-                }
-            }
-
-            is BrowseEvent.OnSearchQueryChange -> {
-                _state.update {
-                    it.copy(
-                        searchQuery = event.query
-                    )
-                }
-                job?.cancel()
-                job = viewModelScope.launch {
-                    delay(500)
-                    getFilesFromDownloads()
-                }
-            }
-
-            is BrowseEvent.OnAddingDialogDismiss -> {
-                _state.update {
-                    it.copy(
-                        showAddingDialog = false
-                    )
-                }
-            }
-
-            is BrowseEvent.OnAddingDialogRequest -> {
-                _state.update {
-                    it.copy(
-                        showAddingDialog = true,
-                        selectedBooks = emptyList()
-                    )
-                }
-                onEvent(BrowseEvent.OnGetBooksFromFiles)
-            }
-
-            is BrowseEvent.OnGetBooksFromFiles -> {
-                viewModelScope.launch(Dispatchers.IO) {
-                    getBooksFromFiles.execute(
-                        _state.value.selectableFiles
-                            .filter { it.second }
-                            .map { it.first }
-                    ).collect { result ->
-                        when (result) {
-                            is Resource.Success -> {
-                                if (result.data?.isEmpty() ?: return@collect) {
-                                    return@collect
-                                }
-                                _state.update {
-                                    it.copy(
-                                        selectedBooks = result.data,
-                                        isBooksLoading = false
-                                    )
-                                }
-                            }
-
-                            is Resource.Loading -> {
-                                _state.update {
-                                    it.copy(
-                                        isBooksLoading = result.isLoading
-                                    )
-                                }
-                            }
-
-                            is Resource.Error -> Unit
-                        }
-                    }
-                }
-            }
-
-            is BrowseEvent.OnAddBooks -> {
-                viewModelScope.launch {
-                    val booksToInsert = _state.value.selectedBooks
-                        .filterIsInstance<NullableBook.NotNull>()
-                        .filter { it.book!!.second }
-                        .map { it.book!!.first }
-
-                    if (booksToInsert.isEmpty()) {
-                        return@launch
-                    }
-
-                    insertBooks.execute(booksToInsert)
-                    val books = fastGetBooks.execute("")
-
-                    event.resetScroll()
-                    _state.update {
-                        it.copy(
-                            showAddingDialog = false
-                        )
-                    }
-                    onEvent(BrowseEvent.OnClearSelectedFiles)
-
-                    event.navigator.navigate(Screen.LIBRARY, Argument("added_books", books))
-                }
-            }
-
-            is BrowseEvent.OnLoadList -> {
-                viewModelScope.launch(Dispatchers.IO) {
-                    _state.update {
-                        it.copy(
-                            isLoading = true
-                        )
-                    }
-                    getFilesFromDownloads("")
-                }
-            }
-
-            is BrowseEvent.OnUpdateScrollIndex -> {
-                _state.update {
-                    it.copy(
-                        scrollIndex = event.index
-                    )
-                }
-            }
-
-            is BrowseEvent.OnUpdateScrollOffset -> {
-                _state.update {
-                    it.copy(
-                        scrollOffset = event.offset
-                    )
-                }
-            }
-        }
-    }
-
-    private suspend fun getFilesFromDownloads(query: String = _state.value.searchQuery) {
-        getFilesFromDownloads.execute(query).collect { result ->
-            when (result) {
-                is Resource.Success -> {
-                    _state.update {
-                        it.copy(
-                            selectableFiles = result.data?.map { book -> Pair(book, false) }
-                                ?: emptyList(),
-                            isLoading = false
-                        )
-                    }
-                }
-
-                is Resource.Loading -> {
-                    _state.update {
-                        it.copy(
-                            isLoading = result.isLoading
-                        )
-                    }
-                }
-
-                is Resource.Error -> Unit
-            }
-        }
-    }
+package ua.acclorite.book_story.presentation.screens.browse.data
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Environment
+import android.provider.Settings
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.isGranted
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import ua.acclorite.book_story.domain.model.NullableBook
+import ua.acclorite.book_story.domain.use_case.FastGetBooks
+import ua.acclorite.book_story.domain.use_case.GetBooksFromFiles
+import ua.acclorite.book_story.domain.use_case.GetFilesFromDownloads
+import ua.acclorite.book_story.domain.use_case.InsertBooks
+import ua.acclorite.book_story.presentation.Argument
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.util.Resource
+import javax.inject.Inject
+
+@OptIn(ExperimentalPermissionsApi::class)
+@HiltViewModel
+class BrowseViewModel @Inject constructor(
+    private val getBooksFromFiles: GetBooksFromFiles,
+    private val getFilesFromDownloads: GetFilesFromDownloads,
+    private val insertBooks: InsertBooks,
+    private val fastGetBooks: FastGetBooks
+) : ViewModel() {
+
+    private val _state = MutableStateFlow(BrowseState())
+    val state = _state.asStateFlow()
+
+    private var job: Job? = null
+
+    init {
+        onEvent(BrowseEvent.OnLoadList)
+    }
+
+    fun onEvent(event: BrowseEvent) {
+        when (event) {
+            is BrowseEvent.OnLegacyStoragePermissionRequest -> {
+                event.permissionState.launchPermissionRequest()
+
+                viewModelScope.launch {
+                    for (i in 0 until 100) {
+                        if (!event.permissionState.status.isGranted) {
+                            delay(100)
+                            continue
+                        }
+                        _state.update {
+                            it.copy(
+                                requestPermissionDialog = false,
+                                showErrorMessage = false
+                            )
+                        }
+                        onEvent(BrowseEvent.OnRefreshList)
+                        break
+                    }
+                }
+            }
+
+            is BrowseEvent.OnStoragePermissionRequest -> {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+
+                    val uri = Uri.parse("package:${event.activity.packageName}")
+                    val intent = Intent(
+                        Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION,
+                        uri
+                    )
+                    event.activity.startActivity(intent)
+
+                    viewModelScope.launch {
+                        for (i in 0 until 20) {
+                            if (!Environment.isExternalStorageManager()) {
+                                delay(1000)
+                                continue
+                            }
+                            _state.update {
+                                it.copy(
+                                    requestPermissionDialog = false,
+                                    showErrorMessage = false
+                                )
+                            }
+                            onEvent(BrowseEvent.OnRefreshList)
+                            break
+                        }
+                    }
+                }
+            }
+
+            is BrowseEvent.OnStoragePermissionDismiss -> {
+                val legacyPermission = Build.VERSION.SDK_INT < Build.VERSION_CODES.R
+                val isPermissionGranted =
+                    if (!legacyPermission) Environment.isExternalStorageManager()
+                    else event.permissionState.status.isGranted
+
+                _state.update {
+                    it.copy(
+                        requestPermissionDialog = false,
+                        showErrorMessage = !isPermissionGranted
+                    )
+                }
+
+                if (isPermissionGranted) {
+                    viewModelScope.launch(Dispatchers.IO) {
+                        getFilesFromDownloads()
+                    }
+                }
+
+            }
+
+            is BrowseEvent.OnRefreshList -> {
+                viewModelScope.launch(Dispatchers.IO) {
+                    _state.update {
+                        it.copy(
+                            isRefreshing = true,
+                            hasSelectedItems = false,
+                            showSearch = false
+                        )
+                    }
+
+                    getFilesFromDownloads("")
+                    delay(500)
+                    _state.update {
+                        it.copy(
+                            isRefreshing = false
+                        )
+                    }
+                }
+            }
+
+            is BrowseEvent.OnPermissionCheck -> {
+                val legacyPermission = Build.VERSION.SDK_INT < Build.VERSION_CODES.R
+                val isPermissionGranted =
+                    if (!legacyPermission) Environment.isExternalStorageManager()
+                    else event.permissionState.status.isGranted
+
+                if (isPermissionGranted) {
+                    return
+                }
+                _state.update {
+                    it.copy(
+                        requestPermissionDialog = true,
+                        showErrorMessage = false
+                    )
+                }
+            }
+
+            is BrowseEvent.OnSelectFile -> {
+                val indexOfFile = _state.value.selectableFiles.indexOf(event.file)
+                val editedList = _state.value.selectableFiles.toMutableList()
+                editedList[indexOfFile] = editedList[indexOfFile].copy(
+                    second = !editedList[indexOfFile].second
+                )
+
+                _state.update {
+                    it.copy(
+                        selectableFiles = editedList.toList(),
+                        selectedItemsCount = editedList.filter { file -> file.second }.size,
+                        hasSelectedItems = editedList.any { file -> file.second }
+                    )
+                }
+            }
+
+            is BrowseEvent.OnSelectBook -> {
+                val indexOfFile = _state.value.selectedBooks.indexOf(event.book)
+                val editedList = _state.value.selectedBooks.toMutableList()
+                editedList[indexOfFile] = NullableBook.NotNull(
+                    editedList[indexOfFile].book!!.copy(
+                        second = !editedList[indexOfFile].book!!.second
+                    )
+                )
+
+                if (!editedList.any { it.book?.second == true }) {
+                    return
+                }
+
+                _state.update {
+                    it.copy(
+                        selectedBooks = editedList
+                    )
+                }
+            }
+
+            is BrowseEvent.OnSearchShowHide -> {
+                viewModelScope.launch(Dispatchers.IO) {
+                    val shouldHide = _state.value.showSearch
+
+                    if (shouldHide) {
+                        getFilesFromDownloads("")
+                    } else {
+                        _state.update {
+                            it.copy(
+                                searchQuery = "",
+                                hasFocused = false
+                            )
+                        }
+                    }
+                    _state.update {
+                        it.copy(
+                            showSearch = !shouldHide
+                        )
+                    }
+                }
+            }
+
+            is BrowseEvent.OnRequestFocus -> {
+                if (!_state.value.hasFocused) {
+                    event.focusRequester.requestFocus()
+                    _state.update {
+                        it.copy(
+                            hasFocused = true
+                        )
+                    }
+                }
+            }
+
+            is BrowseEvent.OnClearSelectedFiles -> {
+                viewModelScope.launch(Dispatchers.IO) {
+                    _state.update {
+                        it.copy(
+                            selectableFiles = it.selectableFiles.map { file -> file.copy(second = false) },
+                            hasSelectedItems = false
+                        )
+                    }
+                }
+            }
+
+            is BrowseEvent.OnSearchQueryChange -> {
+                _state.update {
+                    it.copy(
+                        searchQuery = event.query
+                    )
+                }
+                job?.cancel()
+                job = viewModelScope.launch {
+                    delay(500)
+                    getFilesFromDownloads()
+                }
+            }
+
+            is BrowseEvent.OnAddingDialogDismiss -> {
+                _state.update {
+                    it.copy(
+                        showAddingDialog = false
+                    )
+                }
+            }
+
+            is BrowseEvent.OnAddingDialogRequest -> {
+                _state.update {
+                    it.copy(
+                        showAddingDialog = true,
+                        selectedBooks = emptyList()
+                    )
+                }
+                onEvent(BrowseEvent.OnGetBooksFromFiles)
+            }
+
+            is BrowseEvent.OnGetBooksFromFiles -> {
+                viewModelScope.launch(Dispatchers.IO) {
+                    getBooksFromFiles.execute(
+                        _state.value.selectableFiles
+                            .filter { it.second }
+                            .map { it.first }
+                    ).collect { result ->
+                        when (result) {
+                            is Resource.Success -> {
+                                if (result.data?.isEmpty() ?: return@collect) {
+                                    return@collect
+                                }
+                                _state.update {
+                                    it.copy(
+                                        selectedBooks = result.data,
+                                        isBooksLoading = false
+                                    )
+                                }
+                            }
+
+                            is Resource.Loading -> {
+                                _state.update {
+                                    it.copy(
+                                        isBooksLoading = result.isLoading
+                                    )
+                                }
+                            }
+
+                            is Resource.Error -> Unit
+                        }
+                    }
+                }
+            }
+
+            is BrowseEvent.OnAddBooks -> {
+                viewModelScope.launch {
+                    val booksToInsert = _state.value.selectedBooks
+                        .filterIsInstance<NullableBook.NotNull>()
+                        .filter { it.book!!.second }
+                        .map { it.book!!.first }
+
+                    if (booksToInsert.isEmpty()) {
+                        return@launch
+                    }
+
+                    insertBooks.execute(booksToInsert)
+                    val books = fastGetBooks.execute("")
+
+                    event.resetScroll()
+                    _state.update {
+                        it.copy(
+                            showAddingDialog = false
+                        )
+                    }
+                    onEvent(BrowseEvent.OnClearSelectedFiles)
+                    onEvent(BrowseEvent.OnLoadList)
+
+                    event.navigator.navigate(Screen.LIBRARY, Argument("added_books", books))
+                }
+            }
+
+            is BrowseEvent.OnLoadList -> {
+                viewModelScope.launch(Dispatchers.IO) {
+                    _state.update {
+                        it.copy(
+                            isLoading = true
+                        )
+                    }
+                    getFilesFromDownloads()
+                }
+            }
+
+            is BrowseEvent.OnUpdateScrollIndex -> {
+                _state.update {
+                    it.copy(
+                        scrollIndex = event.index
+                    )
+                }
+            }
+
+            is BrowseEvent.OnUpdateScrollOffset -> {
+                _state.update {
+                    it.copy(
+                        scrollOffset = event.offset
+                    )
+                }
+            }
+        }
+    }
+
+    private suspend fun getFilesFromDownloads(
+        query: String = if (_state.value.showSearch) _state.value.searchQuery else ""
+    ) {
+        getFilesFromDownloads.execute(query).collect { result ->
+            when (result) {
+                is Resource.Success -> {
+                    _state.update {
+                        it.copy(
+                            selectableFiles = result.data?.map { book -> Pair(book, false) }
+                                ?: emptyList(),
+                            isLoading = false
+                        )
+                    }
+                }
+
+                is Resource.Loading -> {
+                    _state.update {
+                        it.copy(
+                            isLoading = result.isLoading
+                        )
+                    }
+                }
+
+                is Resource.Error -> Unit
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/HistoryScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/HistoryScreen.kt
new file mode 100644
index 00000000..7d6740bb
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/HistoryScreen.kt
@@ -0,0 +1,348 @@
+package ua.acclorite.book_story.presentation.screens.history
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.CircularProgressIndicator
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.material.icons.outlined.DeleteSweep
+import androidx.compose.material.pullrefresh.PullRefreshIndicator
+import androidx.compose.material.pullrefresh.pullRefresh
+import androidx.compose.material.pullrefresh.rememberPullRefreshState
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.debounce
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.Argument
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.presentation.components.AnimatedTopAppBar
+import ua.acclorite.book_story.presentation.components.CategoryTitle
+import ua.acclorite.book_story.presentation.components.CustomSnackbar
+import ua.acclorite.book_story.presentation.components.IsEmpty
+import ua.acclorite.book_story.presentation.components.MoreDropDown
+import ua.acclorite.book_story.presentation.screens.history.components.HistoryDeleteWholeHistoryDialog
+import ua.acclorite.book_story.presentation.screens.history.components.HistoryItem
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryViewModel
+import ua.acclorite.book_story.ui.Transitions
+import ua.acclorite.book_story.ui.elevation
+import java.util.UUID
+
+@OptIn(
+    ExperimentalMaterial3Api::class,
+    ExperimentalMaterialApi::class, FlowPreview::class, ExperimentalFoundationApi::class
+)
+@Composable
+fun HistoryScreen(
+    viewModel: HistoryViewModel = hiltViewModel(),
+    navigator: Navigator
+) {
+    val context = LocalContext.current
+    val state by viewModel.state.collectAsState()
+    val refreshState = rememberPullRefreshState(
+        refreshing = state.isRefreshing,
+        onRefresh = {
+            viewModel.onEvent(HistoryEvent.OnRefreshList)
+        }
+    )
+    val focusRequester = remember { FocusRequester() }
+    val snackbarState = remember { SnackbarHostState() }
+    val listState = rememberLazyListState(state.scrollIndex, state.scrollOffset)
+
+    LaunchedEffect(listState) {
+        snapshotFlow {
+            listState.firstVisibleItemIndex
+        }
+            .debounce(10L)
+            .collectLatest {
+                viewModel.onEvent(HistoryEvent.OnUpdateScrollIndex(it))
+            }
+    }
+    LaunchedEffect(listState) {
+        snapshotFlow {
+            listState.firstVisibleItemScrollOffset
+        }
+            .debounce(10L)
+            .collectLatest {
+                viewModel.onEvent(
+                    HistoryEvent.OnUpdateScrollOffset(it)
+                )
+            }
+    }
+
+    if (state.showDeleteWholeHistoryDialog) {
+        HistoryDeleteWholeHistoryDialog(viewModel = viewModel)
+    }
+
+    Scaffold(
+        Modifier
+            .fillMaxSize()
+            .pullRefresh(refreshState),
+        containerColor = MaterialTheme.colorScheme.surface,
+        topBar = {
+            AnimatedTopAppBar(
+                scrolledContainerColor = MaterialTheme.elevation(),
+                scrollBehavior = null,
+                isTopBarScrolled = (state.scrollIndex > 0 || state.scrollOffset > 0) && !state.isLoading,
+
+                content1Visibility = !state.showSearch,
+                content1NavigationIcon = {},
+                content1Title = {
+                    Text(
+                        stringResource(id = R.string.history_screen),
+                        style = MaterialTheme.typography.titleLarge,
+                        color = MaterialTheme.colorScheme.onSurface,
+                        overflow = TextOverflow.Ellipsis,
+                        maxLines = 1
+                    )
+                },
+                content1Actions = {
+                    IconButton(onClick = { viewModel.onEvent(HistoryEvent.OnSearchShowHide) }) {
+                        Icon(
+                            imageVector = Icons.Default.Search,
+                            contentDescription = "Search history",
+                            modifier = Modifier.size(24.dp),
+                            tint = MaterialTheme.colorScheme.onSurfaceVariant
+                        )
+                    }
+                    IconButton(
+                        enabled = !state.isLoading && !state.isRefreshing && state.history.isNotEmpty(),
+                        onClick = {
+                            viewModel.onEvent(HistoryEvent.OnShowHideDeleteWholeHistoryDialog)
+                        }
+                    ) {
+                        Icon(
+                            imageVector = Icons.Outlined.DeleteSweep,
+                            contentDescription = "Delete whole history",
+                            tint = MaterialTheme.colorScheme.onSurfaceVariant
+                        )
+                    }
+                    MoreDropDown(navigator = navigator)
+                },
+
+                content2Visibility = state.showSearch,
+                content2NavigationIcon = {
+                    IconButton(onClick = { viewModel.onEvent(HistoryEvent.OnSearchShowHide) }) {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            contentDescription = "Exit search mode",
+                            modifier = Modifier.size(24.dp),
+                            tint = MaterialTheme.colorScheme.onSurface
+                        )
+                    }
+                },
+                content2Title = {
+                    BasicTextField(
+                        value = state.searchQuery,
+                        singleLine = true,
+                        textStyle = TextStyle(
+                            color = MaterialTheme.colorScheme.onSurface,
+                            fontSize = MaterialTheme.typography.titleLarge.fontSize,
+                            lineHeight = MaterialTheme.typography.titleLarge.lineHeight,
+                            fontFamily = MaterialTheme.typography.titleLarge.fontFamily
+                        ),
+                        modifier = Modifier
+                            .focusRequester(focusRequester)
+                            .onGloballyPositioned {
+                                viewModel.onEvent(HistoryEvent.OnRequestFocus(focusRequester))
+                            },
+                        onValueChange = {
+                            viewModel.onEvent(HistoryEvent.OnSearchQueryChange(it))
+                        },
+                        keyboardOptions = KeyboardOptions(KeyboardCapitalization.Words),
+                        cursorBrush = SolidColor(MaterialTheme.colorScheme.onSurfaceVariant)
+                    ) { innerText ->
+                        Box(
+                            modifier = Modifier.fillMaxHeight(),
+                            contentAlignment = Alignment.CenterStart
+                        ) {
+                            if (state.searchQuery.isEmpty()) {
+                                Text(
+                                    stringResource(
+                                        id = R.string.search_query,
+                                        stringResource(id = R.string.history)
+                                    ),
+                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                                    style = MaterialTheme.typography.titleLarge,
+                                    maxLines = 1,
+                                    overflow = TextOverflow.Ellipsis,
+                                )
+                            }
+                            innerText()
+                        }
+                    }
+                },
+                content2Actions = {
+                    MoreDropDown(navigator = navigator)
+                },
+                content3Visibility = false
+            )
+        },
+        bottomBar = {
+            CustomSnackbar(snackbarState = snackbarState)
+        }
+    ) { paddingValues ->
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(top = paddingValues.calculateTopPadding())
+        ) {
+            LazyColumn(
+                Modifier
+                    .fillMaxSize(),
+                state = listState,
+                contentPadding = PaddingValues(vertical = 12.dp)
+            ) {
+                if (!state.isLoading) {
+                    state.history.forEachIndexed { index, groupedHistory ->
+                        item(key = groupedHistory.title) {
+                            if (index > 0) {
+                                Spacer(modifier = Modifier.height(8.dp))
+                            }
+
+                            CategoryTitle(
+                                modifier = Modifier.animateItemPlacement(tween(300)),
+                                title = when (groupedHistory.title) {
+                                    "today" -> stringResource(id = R.string.today)
+                                    "yesterday" -> stringResource(id = R.string.yesterday)
+                                    else -> groupedHistory.title
+                                },
+                                padding = 16.dp
+                            )
+                            Spacer(modifier = Modifier.height(8.dp))
+                        }
+
+                        items(
+                            groupedHistory.history, key = { it.id ?: UUID.randomUUID() }
+                        ) {
+                            HistoryItem(
+                                modifier = Modifier.animateItemPlacement(tween(300)),
+                                history = it,
+                                onBodyClick = {
+                                    navigator.navigate(
+                                        Screen.BOOK_INFO,
+                                        Argument("book", it.book)
+                                    )
+                                },
+                                onTitleClick = {
+                                    navigator.navigate(
+                                        Screen.READER,
+                                        Argument("book", it.book)
+                                    )
+                                },
+                                onDeleteClick = {
+                                    viewModel.onEvent(
+                                        HistoryEvent.OnDeleteHistoryElement(
+                                            it,
+                                            snackbarState,
+                                            context
+                                        )
+                                    )
+                                }
+                            )
+                        }
+                    }
+                }
+            }
+
+            AnimatedVisibility(
+                visible = !state.isLoading && state.history.isEmpty() && !state.isRefreshing,
+                modifier = Modifier.align(Alignment.Center),
+                enter = Transitions.DefaultTransitionIn,
+                exit = fadeOut(tween(0))
+            ) {
+                IsEmpty(
+                    modifier = Modifier.align(Alignment.Center),
+                    message = stringResource(id = R.string.history_empty),
+                    icon = painterResource(id = R.drawable.empty_history)
+                )
+            }
+            if (state.isLoading && !state.isRefreshing) {
+                CircularProgressIndicator(
+                    color = MaterialTheme.colorScheme.primary,
+                    strokeCap = StrokeCap.Round,
+                    modifier = Modifier
+                        .align(Alignment.Center)
+                        .size(36.dp)
+                )
+            }
+
+            PullRefreshIndicator(
+                state.isRefreshing,
+                refreshState,
+                Modifier.align(Alignment.TopCenter),
+                backgroundColor = MaterialTheme.elevation(),
+                contentColor = MaterialTheme.colorScheme.primary,
+                scale = true
+            )
+        }
+    }
+
+    BackHandler {
+        if (state.showSearch) {
+            viewModel.onEvent(HistoryEvent.OnSearchShowHide)
+            return@BackHandler
+        }
+
+        navigator.navigate(Screen.LIBRARY)
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryDeleteWholeHistoryDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryDeleteWholeHistoryDialog.kt
new file mode 100644
index 00000000..0474860f
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryDeleteWholeHistoryDialog.kt
@@ -0,0 +1,41 @@
+package ua.acclorite.book_story.presentation.screens.history.components
+
+import android.widget.Toast
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.DeleteOutline
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.components.CustomDialogWithContent
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryViewModel
+
+@Composable
+fun HistoryDeleteWholeHistoryDialog(
+    viewModel: HistoryViewModel
+) {
+    val context = LocalContext.current
+
+    CustomDialogWithContent(
+        title = stringResource(id = R.string.delete_history),
+        imageVectorIcon = Icons.Outlined.DeleteOutline,
+        description = stringResource(
+            id = R.string.delete_history_description
+        ),
+        actionText = stringResource(id = R.string.delete),
+        onDismiss = { viewModel.onEvent(HistoryEvent.OnShowHideDeleteWholeHistoryDialog) },
+        withDivider = false,
+        isActionEnabled = true,
+        onAction = {
+            viewModel.onEvent(
+                HistoryEvent.OnDeleteWholeHistory
+            )
+            Toast.makeText(
+                context,
+                context.getString(R.string.history_deleted),
+                Toast.LENGTH_LONG
+            ).show()
+        }
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryItem.kt
new file mode 100644
index 00000000..f1cb83f0
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryItem.kt
@@ -0,0 +1,138 @@
+package ua.acclorite.book_story.presentation.screens.history.components
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Image
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import ua.acclorite.book_story.domain.model.History
+import ua.acclorite.book_story.ui.elevation
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+@Composable
+fun HistoryItem(
+    modifier: Modifier = Modifier,
+    history: History,
+    onBodyClick: () -> Unit,
+    onTitleClick: () -> Unit,
+    onDeleteClick: () -> Unit
+) {
+    val date = Date(history.time)
+    val pattern = SimpleDateFormat("HH:mm", Locale.getDefault())
+
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = modifier
+            .fillMaxWidth()
+            .clickable {
+                onBodyClick()
+            }
+            .padding(top = 6.dp, bottom = 6.dp, start = 16.dp, end = 10.dp)
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier.weight(0.9f)
+        ) {
+            Box(
+                modifier = Modifier
+                    .height(90.dp)
+                    .width(60.dp)
+                    .clip(MaterialTheme.shapes.medium)
+                    .background(MaterialTheme.elevation())
+            ) {
+                Icon(
+                    imageVector = Icons.Default.Image,
+                    contentDescription = "Cover Image not found",
+                    modifier = Modifier
+                        .align(Alignment.Center)
+                        .fillMaxWidth(0.7f)
+                        .aspectRatio(1f),
+                    tint = MaterialTheme.elevation(12.dp)
+                )
+
+                if (history.book.coverImage != null) {
+                    Image(
+                        bitmap = history.book.coverImage.asImageBitmap(),
+                        contentDescription = "Cover",
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .clip(MaterialTheme.shapes.medium),
+                        contentScale = ContentScale.Crop
+                    )
+                }
+            }
+
+            Spacer(modifier = Modifier.width(16.dp))
+
+            Column(
+                verticalArrangement = Arrangement.Center,
+                modifier = Modifier.fillMaxHeight()
+            ) {
+                Text(
+                    history.book.title,
+                    color = MaterialTheme.colorScheme.onSurface,
+                    style = MaterialTheme.typography.bodyLarge,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .clickable(
+                            interactionSource = null,
+                            indication = null,
+                            onClick = onTitleClick
+                        ),
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis
+                )
+                Spacer(modifier = Modifier.height(4.dp))
+                Text(
+                    pattern.format(date),
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    style = MaterialTheme.typography.bodyMedium,
+                    modifier = Modifier
+                        .fillMaxWidth(),
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+            }
+        }
+        Box(modifier = Modifier.weight(0.1f), contentAlignment = Alignment.CenterEnd) {
+            IconButton(
+                onClick = {
+                    onDeleteClick()
+                }
+            ) {
+                Icon(
+                    imageVector = Icons.Outlined.Delete,
+                    contentDescription = "Delete this history element",
+                    tint = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryEvent.kt
new file mode 100644
index 00000000..ff091295
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryEvent.kt
@@ -0,0 +1,24 @@
+package ua.acclorite.book_story.presentation.screens.history.data
+
+import android.content.Context
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.ui.focus.FocusRequester
+import ua.acclorite.book_story.domain.model.History
+
+sealed class HistoryEvent {
+    data object OnRefreshList : HistoryEvent()
+    data object OnLoadList : HistoryEvent()
+    data object OnShowHideDeleteWholeHistoryDialog : HistoryEvent()
+    data object OnDeleteWholeHistory : HistoryEvent()
+    data class OnDeleteHistoryElement(
+        val historyToDelete: History,
+        val snackbarState: SnackbarHostState,
+        val context: Context
+    ) : HistoryEvent()
+
+    data class OnSearchQueryChange(val query: String) : HistoryEvent()
+    data object OnSearchShowHide : HistoryEvent()
+    data class OnRequestFocus(val focusRequester: FocusRequester) : HistoryEvent()
+    data class OnUpdateScrollIndex(val index: Int) : HistoryEvent()
+    data class OnUpdateScrollOffset(val offset: Int) : HistoryEvent()
+}
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryState.kt
new file mode 100644
index 00000000..0f0c6158
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryState.kt
@@ -0,0 +1,19 @@
+package ua.acclorite.book_story.presentation.screens.history.data
+
+import ua.acclorite.book_story.domain.model.GroupedHistory
+
+data class HistoryState(
+    val history: List<GroupedHistory> = emptyList(),
+    val isRefreshing: Boolean = false,
+    val isLoading: Boolean = true,
+
+    val showDeleteWholeHistoryDialog: Boolean = false,
+
+    val showSearch: Boolean = false,
+    val searchQuery: String = "",
+    val hasFocused: Boolean = false,
+
+    val scrollIndex: Int = 0,
+    val scrollOffset: Int = 0,
+
+    )
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryViewModel.kt
new file mode 100644
index 00000000..8217099f
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryViewModel.kt
@@ -0,0 +1,294 @@
+package ua.acclorite.book_story.presentation.screens.history.data
+
+import androidx.compose.material3.SnackbarDuration
+import androidx.compose.material3.SnackbarResult
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.GroupedHistory
+import ua.acclorite.book_story.domain.model.History
+import ua.acclorite.book_story.domain.use_case.DeleteHistory
+import ua.acclorite.book_story.domain.use_case.DeleteWholeHistory
+import ua.acclorite.book_story.domain.use_case.GetHistory
+import ua.acclorite.book_story.domain.use_case.InsertHistory
+import ua.acclorite.book_story.util.Resource
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Locale
+import javax.inject.Inject
+
+@HiltViewModel
+class HistoryViewModel @Inject constructor(
+    private val insertHistory: InsertHistory,
+    private val getHistory: GetHistory,
+    private val deleteWholeHistory: DeleteWholeHistory,
+    private val deleteHistory: DeleteHistory
+) : ViewModel() {
+
+    private val _state = MutableStateFlow(HistoryState())
+    val state = _state.asStateFlow()
+
+    private var job: Job? = null
+
+    init {
+        onEvent(HistoryEvent.OnLoadList)
+    }
+
+    fun onEvent(event: HistoryEvent) {
+        when (event) {
+            is HistoryEvent.OnRefreshList -> {
+                viewModelScope.launch(Dispatchers.IO) {
+                    _state.update {
+                        it.copy(
+                            isRefreshing = true,
+                            showSearch = false
+                        )
+                    }
+
+                    getHistoryFromDatabase("")
+                    delay(500)
+                    _state.update {
+                        it.copy(
+                            isRefreshing = false
+                        )
+                    }
+                }
+            }
+
+            is HistoryEvent.OnLoadList -> {
+                viewModelScope.launch(Dispatchers.IO) {
+                    _state.update {
+                        it.copy(
+                            isLoading = true
+                        )
+                    }
+                    getHistoryFromDatabase()
+                    onEvent(HistoryEvent.OnUpdateScrollIndex(0))
+                    onEvent(HistoryEvent.OnUpdateScrollOffset(0))
+                }
+            }
+
+            is HistoryEvent.OnDeleteWholeHistory -> {
+                viewModelScope.launch {
+                    _state.update {
+                        it.copy(
+                            showDeleteWholeHistoryDialog = false
+                        )
+                    }
+
+                    deleteWholeHistory.execute()
+                    getHistoryFromDatabase("")
+                }
+
+            }
+
+            is HistoryEvent.OnShowHideDeleteWholeHistoryDialog -> {
+                _state.update {
+                    it.copy(
+                        showDeleteWholeHistoryDialog = !it.showDeleteWholeHistoryDialog
+                    )
+                }
+            }
+
+            is HistoryEvent.OnDeleteHistoryElement -> {
+                viewModelScope.launch {
+                    deleteHistory.execute(
+                        listOf(event.historyToDelete)
+                    )
+                    onEvent(HistoryEvent.OnRefreshList)
+
+                    event.snackbarState.currentSnackbarData?.dismiss()
+                    val snackbar = event.snackbarState.showSnackbar(
+                        event.context.getString(R.string.history_element_deleted),
+                        event.context.getString(R.string.undo),
+                        duration = SnackbarDuration.Long
+                    )
+
+                    when (snackbar) {
+                        SnackbarResult.Dismissed -> return@launch
+                        SnackbarResult.ActionPerformed -> {
+                            insertHistory.execute(
+                                listOf(event.historyToDelete)
+                            )
+                            onEvent(HistoryEvent.OnRefreshList)
+                        }
+                    }
+                }
+            }
+
+            is HistoryEvent.OnSearchShowHide -> {
+                viewModelScope.launch(Dispatchers.IO) {
+                    val shouldHide = _state.value.showSearch
+
+                    if (shouldHide) {
+                        getHistoryFromDatabase("")
+                    } else {
+                        _state.update {
+                            it.copy(
+                                searchQuery = "",
+                                hasFocused = false
+                            )
+                        }
+                    }
+                    _state.update {
+                        it.copy(
+                            showSearch = !shouldHide
+                        )
+                    }
+                }
+            }
+
+            is HistoryEvent.OnSearchQueryChange -> {
+                _state.update {
+                    it.copy(
+                        searchQuery = event.query
+                    )
+                }
+                job?.cancel()
+                job = viewModelScope.launch {
+                    delay(500)
+                    getHistoryFromDatabase()
+                }
+            }
+
+            is HistoryEvent.OnRequestFocus -> {
+                if (!_state.value.hasFocused) {
+                    event.focusRequester.requestFocus()
+                    _state.update {
+                        it.copy(
+                            hasFocused = true
+                        )
+                    }
+                }
+            }
+
+            is HistoryEvent.OnUpdateScrollIndex -> {
+                _state.update {
+                    it.copy(
+                        scrollIndex = event.index
+                    )
+                }
+            }
+
+            is HistoryEvent.OnUpdateScrollOffset -> {
+                _state.update {
+                    it.copy(
+                        scrollOffset = event.offset
+                    )
+                }
+            }
+        }
+    }
+
+    private suspend fun getHistoryFromDatabase(
+        query: String = if (_state.value.showSearch) _state.value.searchQuery else ""
+    ) {
+        fun isSameDay(cal1: Calendar, cal2: Calendar): Boolean {
+            return cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
+                    cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR)
+        }
+
+        fun filterMaxElementsById(elements: List<History>): List<History> {
+            val groupedById = elements.groupBy { it.book.id }
+            val maxElementsById = groupedById.map { (_, values) ->
+                values.maxByOrNull { it.time }
+            }
+            return maxElementsById.filterNotNull()
+        }
+
+        getHistory.execute().collect { result ->
+            when (result) {
+                is Resource.Success -> {
+                    _state.update {
+                        it.copy(
+                            history = emptyList()
+                        )
+                    }
+                    val history = result.data?.sortedByDescending { it.time } ?: emptyList()
+
+                    if (history.isEmpty()) {
+                        _state.update {
+                            it.copy(
+                                isLoading = false
+                            )
+                        }
+                        return@collect
+                    }
+
+                    val groupedHistory = mutableListOf<GroupedHistory>()
+
+                    history
+                        .filter {
+                            it.book.title.lowercase().trim().contains(query.lowercase().trim())
+                        }.groupBy { item ->
+                            val calendar = Calendar.getInstance().apply {
+                                timeInMillis = item.time
+                            }
+                            val now = Calendar.getInstance()
+
+                            when {
+                                isSameDay(calendar, now) -> "today"
+                                isSameDay(
+                                    calendar,
+                                    now.apply {
+                                        add(
+                                            Calendar.DAY_OF_YEAR,
+                                            -1
+                                        )
+                                    }) -> "yesterday"
+
+                                else -> SimpleDateFormat(
+                                    "dd.MM.yy",
+                                    Locale.getDefault()
+                                ).format(item.time)
+                            }
+                        }.forEach { (key, value) ->
+                            groupedHistory.add(
+                                GroupedHistory(
+                                    key,
+                                    filterMaxElementsById(value)
+                                )
+                            )
+                        }
+
+                    _state.update {
+                        it.copy(
+                            history = groupedHistory,
+                            isLoading = false
+                        )
+                    }
+                }
+
+                is Resource.Loading -> Unit
+
+                is Resource.Error -> Unit
+            }
+        }
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/LibraryScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/LibraryScreen.kt
similarity index 91%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/library/LibraryScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/library/LibraryScreen.kt
index 00b0a4b8..3f786611 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/LibraryScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/LibraryScreen.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.library
+package ua.acclorite.book_story.presentation.screens.library
 
 import android.widget.Toast
 import androidx.activity.ComponentActivity
@@ -70,34 +70,38 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.presentation.Argument
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.presentation.components.AnimatedTopAppBar
-import com.acclorite.books_history.presentation.components.IsEmpty
-import com.acclorite.books_history.presentation.components.MoreDropDown
-import com.acclorite.books_history.presentation.screens.library.components.LibraryBookItem
-import com.acclorite.books_history.presentation.screens.library.components.LibraryDeleteDialog
-import com.acclorite.books_history.presentation.screens.library.components.LibraryMoveDialog
-import com.acclorite.books_history.presentation.screens.library.components.LibraryTabRow
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
-import com.acclorite.books_history.ui.Transitions
-import com.acclorite.books_history.ui.elevation
-import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.presentation.Argument
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.presentation.components.AnimatedTopAppBar
+import ua.acclorite.book_story.presentation.components.IsEmpty
+import ua.acclorite.book_story.presentation.components.MoreDropDown
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseViewModel
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryViewModel
+import ua.acclorite.book_story.presentation.screens.library.components.LibraryBookItem
+import ua.acclorite.book_story.presentation.screens.library.components.LibraryDeleteDialog
+import ua.acclorite.book_story.presentation.screens.library.components.LibraryMoveDialog
+import ua.acclorite.book_story.presentation.screens.library.components.LibraryTabRow
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.ui.Transitions
+import ua.acclorite.book_story.ui.elevation
+import java.util.UUID
 
 @OptIn(
     ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class,
-    ExperimentalMaterialApi::class, FlowPreview::class
+    ExperimentalMaterialApi::class
 )
 @Composable
 fun LibraryScreen(
     viewModel: LibraryViewModel = hiltViewModel(),
+    browseViewModel: BrowseViewModel = hiltViewModel(),
+    historyViewModel: HistoryViewModel = hiltViewModel(),
     navigator: Navigator,
     addedBooks: List<Book>
 ) {
@@ -129,7 +133,11 @@ fun LibraryScreen(
         LibraryMoveDialog(viewModel = viewModel, pagerState = pagerState)
     }
     if (state.showDeleteDialog) {
-        LibraryDeleteDialog(viewModel = viewModel)
+        LibraryDeleteDialog(
+            viewModel = viewModel,
+            browseViewModel = browseViewModel,
+            historyViewModel = historyViewModel
+        )
     }
 
     Scaffold(
@@ -174,7 +182,7 @@ fun LibraryScreen(
                         IconButton(onClick = { viewModel.onEvent(LibraryEvent.OnSearchShowHide) }) {
                             Icon(
                                 imageVector = Icons.Default.Search,
-                                contentDescription = "Search files",
+                                contentDescription = "Search books",
                                 modifier = Modifier.size(24.dp),
                                 tint = MaterialTheme.colorScheme.onSurfaceVariant
                             )
@@ -321,7 +329,7 @@ fun LibraryScreen(
                         if (!state.isLoading) {
                             items(
                                 categorizedBooks,
-                                key = { it.first.id ?: 0 }
+                                key = { it.first.id ?: UUID.randomUUID() }
                             ) {
                                 LibraryBookItem(
                                     book = it,
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryBookItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryBookItem.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryBookItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryBookItem.kt
index ef76b3dc..f0d168c5 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryBookItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryBookItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.library.components
+package ua.acclorite.book_story.presentation.screens.library.components
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.tween
@@ -35,10 +35,10 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.presentation.data.removeDigits
-import com.acclorite.books_history.presentation.data.removeTrailingZero
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.presentation.data.removeDigits
+import ua.acclorite.book_story.presentation.data.removeTrailingZero
+import ua.acclorite.book_story.ui.elevation
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryDeleteDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryDeleteDialog.kt
similarity index 52%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryDeleteDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryDeleteDialog.kt
index 9cfd1216..1ea9df85 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryDeleteDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryDeleteDialog.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.library.components
+package ua.acclorite.book_story.presentation.screens.library.components
 
 import android.widget.Toast
 import androidx.compose.material.icons.Icons
@@ -8,13 +8,21 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.components.CustomDialogWithContent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.components.CustomDialogWithContent
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseViewModel
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryViewModel
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
 
 @Composable
-fun LibraryDeleteDialog(viewModel: LibraryViewModel) {
+fun LibraryDeleteDialog(
+    viewModel: LibraryViewModel,
+    browseViewModel: BrowseViewModel,
+    historyViewModel: HistoryViewModel
+) {
     val state by viewModel.state.collectAsState()
     val context = LocalContext.current
 
@@ -30,7 +38,12 @@ fun LibraryDeleteDialog(viewModel: LibraryViewModel) {
         withDivider = false,
         isActionEnabled = true,
         onAction = {
-            viewModel.onEvent(LibraryEvent.OnDeleteBooks)
+            viewModel.onEvent(
+                LibraryEvent.OnDeleteBooks {
+                    browseViewModel.onEvent(BrowseEvent.OnLoadList)
+                    historyViewModel.onEvent(HistoryEvent.OnLoadList)
+                }
+            )
             Toast.makeText(
                 context,
                 context.getString(R.string.books_deleted),
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryMoveDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryMoveDialog.kt
similarity index 81%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryMoveDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryMoveDialog.kt
index 4a15cc23..86e17724 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryMoveDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryMoveDialog.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.library.components
+package ua.acclorite.book_story.presentation.screens.library.components
 
 import android.widget.Toast
 import androidx.compose.foundation.ExperimentalFoundationApi
@@ -11,12 +11,12 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.presentation.components.CustomDialogWithLazyColumn
-import com.acclorite.books_history.presentation.components.SelectableDialogItem
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.presentation.components.CustomDialogWithLazyColumn
+import ua.acclorite.book_story.presentation.components.SelectableDialogItem
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryTabRow.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryTabRow.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryTabRow.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryTabRow.kt
index 076afacd..664ce0ee 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryTabRow.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryTabRow.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.library.components
+package ua.acclorite.book_story.presentation.screens.library.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
@@ -24,12 +24,12 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.ui.elevation
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/data/LibraryEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryEvent.kt
similarity index 83%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/library/data/LibraryEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryEvent.kt
index ccea5cd0..a5967bdc 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/data/LibraryEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryEvent.kt
@@ -1,12 +1,12 @@
 @file:OptIn(ExperimentalFoundationApi::class)
 
-package com.acclorite.books_history.presentation.screens.library.data
+package ua.acclorite.book_story.presentation.screens.library.data
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.ui.focus.FocusRequester
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
 
 sealed class LibraryEvent {
     data class OnPreloadBooks(val books: List<Book>) : LibraryEvent()
@@ -25,6 +25,6 @@ sealed class LibraryEvent {
     data class OnSelectCategory(val category: Category) : LibraryEvent()
     data class OnMoveBooks(val pagerState: PagerState) : LibraryEvent()
     data object OnShowHideDeleteDialog : LibraryEvent()
-    data object OnDeleteBooks : LibraryEvent()
+    data class OnDeleteBooks(val refreshList: () -> Unit) : LibraryEvent()
     data class OnUpdateBook(val book: Book) : LibraryEvent()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/data/LibraryState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryState.kt
similarity index 77%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/library/data/LibraryState.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryState.kt
index 9b7be6ba..22794824 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/data/LibraryState.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryState.kt
@@ -1,8 +1,8 @@
-package com.acclorite.books_history.presentation.screens.library.data
+package ua.acclorite.book_story.presentation.screens.library.data
 
 import androidx.compose.runtime.Immutable
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
 
 @Immutable
 data class LibraryState(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/data/LibraryViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryViewModel.kt
similarity index 93%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/library/data/LibraryViewModel.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryViewModel.kt
index 595a543a..b25724b2 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/data/LibraryViewModel.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryViewModel.kt
@@ -1,13 +1,8 @@
-package com.acclorite.books_history.presentation.screens.library.data
+package ua.acclorite.book_story.presentation.screens.library.data
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.domain.use_case.DeleteBooks
-import com.acclorite.books_history.domain.use_case.GetBooks
-import com.acclorite.books_history.domain.use_case.UpdateBooks
-import com.acclorite.books_history.util.Resource
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -16,6 +11,11 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.domain.use_case.DeleteBooks
+import ua.acclorite.book_story.domain.use_case.GetBooks
+import ua.acclorite.book_story.domain.use_case.UpdateBooks
+import ua.acclorite.book_story.util.Resource
 import javax.inject.Inject
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -32,9 +32,7 @@ class LibraryViewModel @Inject constructor(
     private var job: Job? = null
 
     init {
-        viewModelScope.launch(Dispatchers.IO) {
-            getBooksFromDatabase()
-        }
+        onEvent(LibraryEvent.OnLoadList)
     }
 
     fun onEvent(event: LibraryEvent) {
@@ -71,10 +69,8 @@ class LibraryViewModel @Inject constructor(
                     _state.update {
                         it.copy(
                             isRefreshing = true,
-                            selectedItemsCount = 0,
                             hasSelectedItems = false,
-                            showSearch = false,
-                            books = emptyList()
+                            showSearch = false
                         )
                     }
 
@@ -253,6 +249,7 @@ class LibraryViewModel @Inject constructor(
                     deleteBooks.execute(books)
 
                     getBooksFromDatabase()
+                    event.refreshList()
 
                     onEvent(LibraryEvent.OnClearSelectedBooks)
                 }
@@ -275,7 +272,9 @@ class LibraryViewModel @Inject constructor(
         }
     }
 
-    private suspend fun getBooksFromDatabase(query: String = _state.value.searchQuery) {
+    private suspend fun getBooksFromDatabase(
+        query: String = if (_state.value.showSearch) _state.value.searchQuery else ""
+    ) {
         getBooks.execute(query).collect { result ->
             when (result) {
                 is Resource.Success -> {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/ReaderScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/ReaderScreen.kt
similarity index 88%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/ReaderScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/ReaderScreen.kt
index 82eac8a0..2c8d9d18 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/ReaderScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/ReaderScreen.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.reader
+package ua.acclorite.book_story.presentation.screens.reader
 
 import android.annotation.SuppressLint
 import androidx.activity.ComponentActivity
@@ -51,32 +51,36 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.components.IsError
-import com.acclorite.books_history.presentation.data.MainViewModel
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
-import com.acclorite.books_history.presentation.screens.reader.components.ReaderBottomBar
-import com.acclorite.books_history.presentation.screens.reader.components.ReaderEndItem
-import com.acclorite.books_history.presentation.screens.reader.components.ReaderSettingsBottomSheet
-import com.acclorite.books_history.presentation.screens.reader.components.ReaderStartItem
-import com.acclorite.books_history.presentation.screens.reader.components.ReaderTopBar
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderEvent
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderViewModel
-import com.acclorite.books_history.ui.elevation
-import com.acclorite.books_history.util.Constants
 import dagger.hilt.android.lifecycle.withCreationCallback
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.debounce
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.components.IsError
+import ua.acclorite.book_story.presentation.data.MainViewModel
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryViewModel
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.presentation.screens.reader.components.ReaderBottomBar
+import ua.acclorite.book_story.presentation.screens.reader.components.ReaderEndItem
+import ua.acclorite.book_story.presentation.screens.reader.components.ReaderSettingsBottomSheet
+import ua.acclorite.book_story.presentation.screens.reader.components.ReaderStartItem
+import ua.acclorite.book_story.presentation.screens.reader.components.ReaderTopBar
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderViewModel
+import ua.acclorite.book_story.ui.elevation
+import ua.acclorite.book_story.util.Constants
 
 @OptIn(FlowPreview::class)
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @Composable
 fun ReaderScreen(
-    mainViewModel: MainViewModel,
+    mainViewModel: MainViewModel = hiltViewModel(),
+    libraryViewModel: LibraryViewModel = hiltViewModel(),
+    historyViewModel: HistoryViewModel = hiltViewModel(),
     navigator: Navigator
 ) {
     val context = LocalContext.current as ComponentActivity
@@ -95,7 +99,6 @@ fun ReaderScreen(
                 }
         }
     )
-    val libraryViewModel: LibraryViewModel = hiltViewModel()
 
     var loading by remember { mutableStateOf(true) }
     val state by viewModel.state.collectAsState()
@@ -139,6 +142,7 @@ fun ReaderScreen(
             listState,
             refreshList = {
                 libraryViewModel.onEvent(LibraryEvent.OnUpdateBook(it))
+                historyViewModel.onEvent(HistoryEvent.OnLoadList)
             },
             onLoaded = {
                 loading = false
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderBottomBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderBottomBar.kt
similarity index 84%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderBottomBar.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderBottomBar.kt
index d8b6b422..6ae3075a 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderBottomBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderBottomBar.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.reader.components
+package ua.acclorite.book_story.presentation.screens.reader.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -19,13 +19,13 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.data.removeDigits
-import com.acclorite.books_history.presentation.data.removeTrailingZero
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderEvent
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderViewModel
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.data.removeDigits
+import ua.acclorite.book_story.presentation.data.removeTrailingZero
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderViewModel
 
 @Composable
 fun ReaderBottomBar(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderEndItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderEndItem.kt
similarity index 86%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderEndItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderEndItem.kt
index 107b4718..47d27f7d 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderEndItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderEndItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.reader.components
+package ua.acclorite.book_story.presentation.screens.reader.components
 
 import android.widget.Toast
 import androidx.activity.ComponentActivity
@@ -24,14 +24,14 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderEvent
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderViewModel
 
 @Composable
 fun ReaderEndItem(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderSettingsBottomSheet.kt
similarity index 90%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheet.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderSettingsBottomSheet.kt
index bfd4d210..0e1c507b 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheet.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderSettingsBottomSheet.kt
@@ -1,11 +1,10 @@
-package com.acclorite.books_history.presentation.screens.reader.components
+package ua.acclorite.book_story.presentation.screens.reader.components
 
 import androidx.activity.ComponentActivity
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.asPaddingValues
@@ -34,24 +33,23 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.ChipItem
-import com.acclorite.books_history.presentation.components.CategoryTitle
-import com.acclorite.books_history.presentation.data.MainEvent
-import com.acclorite.books_history.presentation.data.MainViewModel
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderEvent
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderViewModel
-import com.acclorite.books_history.presentation.screens.settings.components.CheckboxWithTitle
-import com.acclorite.books_history.presentation.screens.settings.components.ChipsWithTitle
-import com.acclorite.books_history.presentation.screens.settings.components.ColorPickerWithTitle
-import com.acclorite.books_history.presentation.screens.settings.components.SliderWithTitle
-import com.acclorite.books_history.ui.ElevationDefaults
-import com.acclorite.books_history.ui.elevation
-import com.acclorite.books_history.util.Constants
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.ChipItem
+import ua.acclorite.book_story.presentation.components.CategoryTitle
+import ua.acclorite.book_story.presentation.data.MainEvent
+import ua.acclorite.book_story.presentation.data.MainViewModel
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderViewModel
+import ua.acclorite.book_story.presentation.screens.settings.components.CheckboxWithTitle
+import ua.acclorite.book_story.presentation.screens.settings.components.ChipsWithTitle
+import ua.acclorite.book_story.presentation.screens.settings.components.ColorPickerWithTitle
+import ua.acclorite.book_story.presentation.screens.settings.components.SliderWithTitle
+import ua.acclorite.book_story.ui.ElevationDefaults
+import ua.acclorite.book_story.ui.elevation
+import ua.acclorite.book_story.util.Constants
 
 @OptIn(
-    ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class,
-    ExperimentalLayoutApi::class
+    ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class
 )
 @Composable
 fun ReaderSettingsBottomSheet(mainViewModel: MainViewModel, viewModel: ReaderViewModel) {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheetTabRow.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderSettingsBottomSheetTabRow.kt
similarity index 90%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheetTabRow.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderSettingsBottomSheetTabRow.kt
index 53529321..28d787c4 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheetTabRow.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderSettingsBottomSheetTabRow.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.reader.components
+package ua.acclorite.book_story.presentation.screens.reader.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -17,9 +17,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderEvent
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderViewModel
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderStartItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderStartItem.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderStartItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderStartItem.kt
index 732857a0..b397dafa 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderStartItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderStartItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.reader.components
+package ua.acclorite.book_story.presentation.screens.reader.components
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -29,9 +29,9 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderViewModel
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderViewModel
+import ua.acclorite.book_story.ui.elevation
 
 @Composable
 fun ReaderStartItem(viewModel: ReaderViewModel) {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderTopBar.kt
similarity index 88%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderTopBar.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderTopBar.kt
index ffd53524..37a88904 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderTopBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderTopBar.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.reader.components
+package ua.acclorite.book_story.presentation.screens.reader.components
 
 import androidx.activity.ComponentActivity
 import androidx.compose.foundation.basicMarquee
@@ -30,14 +30,14 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.Argument
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.presentation.data.removeDigits
-import com.acclorite.books_history.presentation.data.removeTrailingZero
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderEvent
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.Argument
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.presentation.data.removeDigits
+import ua.acclorite.book_story.presentation.data.removeTrailingZero
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/data/ReaderEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderEvent.kt
similarity index 88%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/data/ReaderEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderEvent.kt
index f858a7c5..f9294234 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/data/ReaderEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderEvent.kt
@@ -1,13 +1,13 @@
 @file:OptIn(ExperimentalFoundationApi::class)
 
-package com.acclorite.books_history.presentation.screens.reader.data
+package ua.acclorite.book_story.presentation.screens.reader.data
 
 import androidx.activity.ComponentActivity
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.pager.PagerState
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.presentation.Navigator
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.presentation.Navigator
 
 sealed class ReaderEvent {
     data class OnFileNotFound(val onLoaded: () -> Unit) : ReaderEvent()
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/data/ReaderState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderState.kt
similarity index 60%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/data/ReaderState.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderState.kt
index 5da45419..056f6758 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/data/ReaderState.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderState.kt
@@ -1,8 +1,8 @@
-package com.acclorite.books_history.presentation.screens.reader.data
+package ua.acclorite.book_story.presentation.screens.reader.data
 
 import androidx.compose.runtime.Immutable
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.util.UIText
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.util.UIText
 
 @Immutable
 data class ReaderState(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/data/ReaderViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderViewModel.kt
similarity index 89%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/data/ReaderViewModel.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderViewModel.kt
index ed2cfbea..1184f683 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/data/ReaderViewModel.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderViewModel.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.reader.data
+package ua.acclorite.book_story.presentation.screens.reader.data
 
 import androidx.activity.ComponentActivity
 import androidx.compose.foundation.ExperimentalFoundationApi
@@ -9,16 +9,6 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.domain.use_case.GetText
-import com.acclorite.books_history.domain.use_case.UpdateBooks
-import com.acclorite.books_history.presentation.Argument
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.util.Resource
-import com.acclorite.books_history.util.UIText
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -30,6 +20,18 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.domain.model.History
+import ua.acclorite.book_story.domain.use_case.GetText
+import ua.acclorite.book_story.domain.use_case.InsertHistory
+import ua.acclorite.book_story.domain.use_case.UpdateBooks
+import ua.acclorite.book_story.presentation.Argument
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.util.Resource
+import ua.acclorite.book_story.util.UIText
 import java.util.Date
 import kotlin.math.roundToInt
 
@@ -38,7 +40,8 @@ import kotlin.math.roundToInt
 class ReaderViewModel @AssistedInject constructor(
     @Assisted book: Book,
     private val getText: GetText,
-    private val updateBooks: UpdateBooks
+    private val updateBooks: UpdateBooks,
+    private val insertHistory: InsertHistory
 ) : ViewModel() {
 
     private val _state = MutableStateFlow(ReaderState(book))
@@ -94,10 +97,12 @@ class ReaderViewModel @AssistedInject constructor(
                         }
                     }
 
+                    val time = Date().time
+
                     _state.update {
                         it.copy(
                             book = it.book.copy(
-                                lastOpened = Date().time
+                                lastOpened = time
                             )
                         )
                     }
@@ -105,11 +110,19 @@ class ReaderViewModel @AssistedInject constructor(
                     updateBooks.execute(
                         listOf(_state.value.book)
                     )
+                    insertHistory.execute(
+                        listOf(
+                            History(
+                                null,
+                                _state.value.book,
+                                time
+                            )
+                        )
+                    )
                     event.refreshList(_state.value.book)
                     event.navigator.putArgument(
                         Argument("book", _state.value.book)
                     )
-                    //todo add history
 
                     viewModelScope.launch {
                         snapshotFlow {
@@ -127,7 +140,7 @@ class ReaderViewModel @AssistedInject constructor(
                                         }
                                     }
                                 }
-                                //todo fix blinking
+
                                 delay(500)
                                 event.onLoaded()
                                 return@collectLatest
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/SettingsScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/SettingsScreen.kt
similarity index 82%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/SettingsScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/SettingsScreen.kt
index 06509c70..77985539 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/SettingsScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/SettingsScreen.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings
+package ua.acclorite.book_story.presentation.screens.settings
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
@@ -16,18 +16,17 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.presentation.screens.settings.components.SettingsCategoryItem
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.presentation.components.AnimatedTopAppBar
+import ua.acclorite.book_story.presentation.screens.settings.components.SettingsCategoryItem
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -43,17 +42,11 @@ fun SettingsScreen(
             .windowInsetsPadding(WindowInsets.navigationBars),
         containerColor = MaterialTheme.colorScheme.surface,
         topBar = {
-            TopAppBar(
-                title = {
-                    Text(
-                        stringResource(id = R.string.settings_screen),
-                        style = MaterialTheme.typography.titleLarge,
-                        color = MaterialTheme.colorScheme.onSurface,
-                        overflow = TextOverflow.Ellipsis,
-                        maxLines = 1
-                    )
-                },
-                navigationIcon = {
+            AnimatedTopAppBar(
+                scrollBehavior = scrollBehavior,
+                isTopBarScrolled = null,
+
+                content1NavigationIcon = {
                     IconButton(onClick = { navigator.navigateBack() }) {
                         Icon(
                             imageVector = Icons.AutoMirrored.Filled.ArrowBack,
@@ -62,11 +55,16 @@ fun SettingsScreen(
                         )
                     }
                 },
-                scrollBehavior = scrollBehavior,
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.surface,
-                    scrolledContainerColor = MaterialTheme.elevation()
-                )
+                content1Title = {
+                    Text(
+                        stringResource(id = R.string.settings_screen),
+                        style = MaterialTheme.typography.titleLarge,
+                        color = MaterialTheme.colorScheme.onSurface,
+                        overflow = TextOverflow.Ellipsis,
+                        maxLines = 1
+                    )
+                },
+                content1Actions = {}
             )
         }
     ) { paddingValues ->
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/CheckboxWIthTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/CheckboxWIthTitle.kt
similarity index 88%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/CheckboxWIthTitle.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/CheckboxWIthTitle.kt
index 16e33546..e7fbcf54 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/CheckboxWIthTitle.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/CheckboxWIthTitle.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings.components
+package ua.acclorite.book_story.presentation.screens.settings.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
@@ -12,7 +12,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.presentation.components.CategoryTitle
+import ua.acclorite.book_story.presentation.components.CategoryTitle
 
 @Composable
 fun CheckboxWithTitle(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/ChipsWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ChipsWithTitle.kt
similarity index 93%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/ChipsWithTitle.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ChipsWithTitle.kt
index 96b1492c..8d8fa4d0 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/ChipsWithTitle.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ChipsWithTitle.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings.components
+package ua.acclorite.book_story.presentation.screens.settings.components
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.Arrangement
@@ -19,8 +19,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.domain.model.ChipItem
-import com.acclorite.books_history.presentation.components.CategoryTitle
+import ua.acclorite.book_story.domain.model.ChipItem
+import ua.acclorite.book_story.presentation.components.CategoryTitle
 
 @OptIn(ExperimentalMaterialApi::class, ExperimentalLayoutApi::class)
 @Composable
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/ColorPickerWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ColorPickerWithTitle.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/ColorPickerWithTitle.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ColorPickerWithTitle.kt
index 927253b8..3396ee86 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/ColorPickerWithTitle.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ColorPickerWithTitle.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings.components
+package ua.acclorite.book_story.presentation.screens.settings.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -25,8 +25,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.components.CategoryTitle
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.components.CategoryTitle
 
 @Composable
 fun ColorPickerWithTitle(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SettingsCategoryItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SettingsCategoryItem.kt
similarity index 96%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SettingsCategoryItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SettingsCategoryItem.kt
index 55565312..3babc5c4 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SettingsCategoryItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SettingsCategoryItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings.components
+package ua.acclorite.book_story.presentation.screens.settings.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SliderWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SliderWithTitle.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SliderWithTitle.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SliderWithTitle.kt
index 8939be44..c3c048ec 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SliderWithTitle.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SliderWithTitle.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings.components
+package ua.acclorite.book_story.presentation.screens.settings.components
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -15,7 +15,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.presentation.components.CategoryTitle
+import ua.acclorite.book_story.presentation.components.CategoryTitle
 import kotlin.math.roundToInt
 
 @Composable
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/appearance/AppearanceSettings.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/AppearanceSettings.kt
similarity index 77%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/appearance/AppearanceSettings.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/AppearanceSettings.kt
index 1dc549a1..5405f01a 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/appearance/AppearanceSettings.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/AppearanceSettings.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings.nested.appearance
+package ua.acclorite.book_story.presentation.screens.settings.nested.appearance
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
@@ -14,7 +14,6 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -22,20 +21,21 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.ChipItem
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.data.MainEvent
-import com.acclorite.books_history.presentation.data.MainViewModel
-import com.acclorite.books_history.presentation.screens.settings.components.ChipsWithTitle
-import com.acclorite.books_history.presentation.screens.settings.nested.appearance.components.AppearanceSettingsThemeSwitcher
-import com.acclorite.books_history.ui.DarkTheme
-import com.acclorite.books_history.ui.elevation
+import androidx.hilt.navigation.compose.hiltViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.ChipItem
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.components.AnimatedTopAppBar
+import ua.acclorite.book_story.presentation.data.MainEvent
+import ua.acclorite.book_story.presentation.data.MainViewModel
+import ua.acclorite.book_story.presentation.screens.settings.components.ChipsWithTitle
+import ua.acclorite.book_story.presentation.screens.settings.nested.appearance.components.AppearanceSettingsThemeSwitcher
+import ua.acclorite.book_story.ui.DarkTheme
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AppearanceSettings(
-    mainViewModel: MainViewModel,
+    mainViewModel: MainViewModel = hiltViewModel(),
     navigator: Navigator
 ) {
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
@@ -49,17 +49,11 @@ fun AppearanceSettings(
             .windowInsetsPadding(WindowInsets.navigationBars),
         containerColor = MaterialTheme.colorScheme.surface,
         topBar = {
-            TopAppBar(
-                title = {
-                    Text(
-                        stringResource(id = R.string.appearance_settings),
-                        style = MaterialTheme.typography.titleLarge,
-                        color = MaterialTheme.colorScheme.onSurface,
-                        overflow = TextOverflow.Ellipsis,
-                        maxLines = 1
-                    )
-                },
-                navigationIcon = {
+            AnimatedTopAppBar(
+                scrollBehavior = scrollBehavior,
+                isTopBarScrolled = null,
+
+                content1NavigationIcon = {
                     IconButton(onClick = { navigator.navigateBack() }) {
                         Icon(
                             imageVector = Icons.AutoMirrored.Filled.ArrowBack,
@@ -68,11 +62,16 @@ fun AppearanceSettings(
                         )
                     }
                 },
-                scrollBehavior = scrollBehavior,
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.surface,
-                    scrolledContainerColor = MaterialTheme.elevation()
-                )
+                content1Title = {
+                    Text(
+                        stringResource(id = R.string.appearance_settings),
+                        style = MaterialTheme.typography.titleLarge,
+                        color = MaterialTheme.colorScheme.onSurface,
+                        overflow = TextOverflow.Ellipsis,
+                        maxLines = 1
+                    )
+                },
+                content1Actions = {}
             )
         }
     ) { paddingValues ->
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcher.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcher.kt
similarity index 81%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcher.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcher.kt
index 4a3eaaa1..d543800d 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcher.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcher.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings.nested.appearance.components
+package ua.acclorite.book_story.presentation.screens.settings.nested.appearance.components
 
 import android.os.Build
 import androidx.compose.foundation.layout.Column
@@ -13,13 +13,13 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.components.CategoryTitle
-import com.acclorite.books_history.presentation.data.MainEvent
-import com.acclorite.books_history.presentation.data.MainViewModel
-import com.acclorite.books_history.ui.Theme
-import com.acclorite.books_history.ui.isDark
-import com.acclorite.books_history.util.Constants
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.components.CategoryTitle
+import ua.acclorite.book_story.presentation.data.MainEvent
+import ua.acclorite.book_story.presentation.data.MainViewModel
+import ua.acclorite.book_story.ui.Theme
+import ua.acclorite.book_story.ui.isDark
+import ua.acclorite.book_story.util.Constants
 
 @Composable
 fun AppearanceSettingsThemeSwitcher(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcherItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcherItem.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcherItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcherItem.kt
index 151d7240..df5e3b9b 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcherItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcherItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings.nested.appearance.components
+package ua.acclorite.book_story.presentation.screens.settings.nested.appearance.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -29,9 +29,9 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.ui.Theme
-import com.acclorite.books_history.ui.colorScheme
-import com.acclorite.books_history.util.UIText
+import ua.acclorite.book_story.ui.Theme
+import ua.acclorite.book_story.ui.colorScheme
+import ua.acclorite.book_story.util.UIText
 
 @Composable
 fun AppearanceSettingsThemeSwitcherItem(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/general/GeneralSettings.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/GeneralSettings.kt
similarity index 77%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/general/GeneralSettings.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/GeneralSettings.kt
index 46c68e2d..01cc5d76 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/general/GeneralSettings.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/GeneralSettings.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings.nested.general
+package ua.acclorite.book_story.presentation.screens.settings.nested.general
 
 import androidx.activity.ComponentActivity
 import androidx.compose.foundation.layout.WindowInsets
@@ -15,7 +15,6 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -24,19 +23,20 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.ChipItem
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.data.MainEvent
-import com.acclorite.books_history.presentation.data.MainViewModel
-import com.acclorite.books_history.presentation.screens.settings.components.ChipsWithTitle
-import com.acclorite.books_history.ui.elevation
-import com.acclorite.books_history.util.Constants
+import androidx.hilt.navigation.compose.hiltViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.ChipItem
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.components.AnimatedTopAppBar
+import ua.acclorite.book_story.presentation.data.MainEvent
+import ua.acclorite.book_story.presentation.data.MainViewModel
+import ua.acclorite.book_story.presentation.screens.settings.components.ChipsWithTitle
+import ua.acclorite.book_story.util.Constants
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun GeneralSettings(
-    mainViewModel: MainViewModel,
+    mainViewModel: MainViewModel = hiltViewModel(),
     navigator: Navigator
 ) {
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
@@ -51,17 +51,11 @@ fun GeneralSettings(
             .windowInsetsPadding(WindowInsets.navigationBars),
         containerColor = MaterialTheme.colorScheme.surface,
         topBar = {
-            TopAppBar(
-                title = {
-                    Text(
-                        stringResource(id = R.string.general_settings),
-                        style = MaterialTheme.typography.titleLarge,
-                        color = MaterialTheme.colorScheme.onSurface,
-                        overflow = TextOverflow.Ellipsis,
-                        maxLines = 1
-                    )
-                },
-                navigationIcon = {
+            AnimatedTopAppBar(
+                scrollBehavior = scrollBehavior,
+                isTopBarScrolled = null,
+
+                content1NavigationIcon = {
                     IconButton(onClick = { navigator.navigateBack() }) {
                         Icon(
                             imageVector = Icons.AutoMirrored.Filled.ArrowBack,
@@ -70,11 +64,16 @@ fun GeneralSettings(
                         )
                     }
                 },
-                scrollBehavior = scrollBehavior,
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.surface,
-                    scrolledContainerColor = MaterialTheme.elevation()
-                )
+                content1Title = {
+                    Text(
+                        stringResource(id = R.string.general_settings),
+                        style = MaterialTheme.typography.titleLarge,
+                        color = MaterialTheme.colorScheme.onSurface,
+                        overflow = TextOverflow.Ellipsis,
+                        maxLines = 1
+                    )
+                },
+                content1Actions = {}
             )
         }
     ) { paddingValues ->
@@ -86,7 +85,7 @@ fun GeneralSettings(
             item {
                 ChipsWithTitle(
                     title = stringResource(id = R.string.language_option),
-                    chips = Constants.LANGUAGES.map {
+                    chips = Constants.LANGUAGES.sortedBy { it.second }.map {
                         ChipItem(
                             it.first,
                             it.second,
diff --git a/app/src/main/java/com/acclorite/books_history/ui/Color.kt b/app/src/main/java/ua/acclorite/book_story/ui/Color.kt
similarity index 77%
rename from app/src/main/java/com/acclorite/books_history/ui/Color.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/Color.kt
index 24e7ede3..c676f833 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/Color.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/Color.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui
+package ua.acclorite.book_story.ui
 
 import android.annotation.SuppressLint
 import androidx.compose.material3.ColorScheme
@@ -6,21 +6,23 @@ import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
-import com.acclorite.books_history.ui.theme.blueTheme
-import com.acclorite.books_history.ui.theme.greenTheme
-import com.acclorite.books_history.ui.theme.pinkTheme
-import com.acclorite.books_history.ui.theme.purpleTheme
-import com.acclorite.books_history.ui.theme.redTheme
-import com.acclorite.books_history.ui.theme.yellowTheme
+import ua.acclorite.book_story.ui.theme.aquaTheme
+import ua.acclorite.book_story.ui.theme.blueTheme
+import ua.acclorite.book_story.ui.theme.greenTheme
+import ua.acclorite.book_story.ui.theme.pinkTheme
+import ua.acclorite.book_story.ui.theme.purpleTheme
+import ua.acclorite.book_story.ui.theme.redTheme
+import ua.acclorite.book_story.ui.theme.yellowTheme
 
 enum class Theme {
     DYNAMIC,
     BLUE,
-    PURPLE,
     GREEN,
+    RED,
+    PURPLE,
     PINK,
     YELLOW,
-    RED
+    AQUA
 }
 
 /**
@@ -34,6 +36,7 @@ fun String.toTheme(): Theme {
         "PINK" -> Theme.PINK
         "YELLOW" -> Theme.YELLOW
         "RED" -> Theme.RED
+        "AQUA" -> Theme.AQUA
         else -> Theme.BLUE
     }
 }
@@ -86,5 +89,10 @@ fun colorScheme(theme: Theme, darkTheme: Boolean): ColorScheme {
             /* Red Theme */
             return redTheme(isDark = darkTheme)
         }
+
+        Theme.AQUA -> {
+            /* Aqua Theme */
+            return aquaTheme(isDark = darkTheme)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/ui/Elevation.kt b/app/src/main/java/ua/acclorite/book_story/ui/Elevation.kt
similarity index 74%
rename from app/src/main/java/com/acclorite/books_history/ui/Elevation.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/Elevation.kt
index cc0f519a..c12a5505 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/Elevation.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/Elevation.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui
+package ua.acclorite.book_story.ui
 
 import androidx.compose.ui.unit.dp
 
diff --git a/app/src/main/java/com/acclorite/books_history/ui/Theme.kt b/app/src/main/java/ua/acclorite/book_story/ui/Theme.kt
similarity index 98%
rename from app/src/main/java/com/acclorite/books_history/ui/Theme.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/Theme.kt
index 7a0ba602..e3c2bc07 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/Theme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/Theme.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui
+package ua.acclorite.book_story.ui
 
 import android.app.Activity
 import android.os.Build
diff --git a/app/src/main/java/com/acclorite/books_history/ui/Transitions.kt b/app/src/main/java/ua/acclorite/book_story/ui/Transitions.kt
similarity index 75%
rename from app/src/main/java/com/acclorite/books_history/ui/Transitions.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/Transitions.kt
index 34fe0e01..71e701e7 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/Transitions.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/Transitions.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui
+package ua.acclorite.book_story.ui
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.tween
@@ -13,18 +13,20 @@ object Transitions {
     val DefaultTransitionIn = fadeIn(tween(300))
     val DefaultTransitionOut = fadeOut(tween(300))
 
-    val SlidingTransitionIn = fadeIn(tween(300)) +
-            slideInHorizontally(tween(300)) { it / 6 }
+    val FadeTransitionIn = fadeIn(tween(300))
+    val FadeTransitionOut = fadeOut(tween(50))
 
-    val SlidingTransitionOut = fadeOut(tween(300)) +
-            slideOutHorizontally(tween(300)) { it / 6 }
+    val SlidingTransitionIn = fadeIn(tween(300)) +
+            slideInHorizontally(tween(300)) { it / 15 }
+
+    val SlidingTransitionOut = fadeOut(tween(200)) +
+            slideOutHorizontally(tween(200)) { it / 25 }
 }
 
 @Composable
 fun DefaultTransition(
     visible: Boolean,
     modifier: Modifier = Modifier,
-
     content: @Composable (() -> Unit)
 ) {
     AnimatedVisibility(
diff --git a/app/src/main/java/com/acclorite/books_history/ui/Typography.kt b/app/src/main/java/ua/acclorite/book_story/ui/Typography.kt
similarity index 97%
rename from app/src/main/java/com/acclorite/books_history/ui/Typography.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/Typography.kt
index 5e16a3e4..82258847 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/Typography.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/Typography.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui
+package ua.acclorite.book_story.ui
 
 import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/AquaTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/AquaTheme.kt
new file mode 100644
index 00000000..782d3c9c
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/AquaTheme.kt
@@ -0,0 +1,136 @@
+package ua.acclorite.book_story.ui.theme
+
+import androidx.compose.material3.ColorScheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+
+private val md_theme_light_primary = Color(0xFF006876)
+private val md_theme_light_onPrimary = Color(0xFFFFFFFF)
+private val md_theme_light_primaryContainer = Color(0xFFA1EFFF)
+private val md_theme_light_onPrimaryContainer = Color(0xFF001F25)
+private val md_theme_light_secondary = Color(0xFF4A6268)
+private val md_theme_light_onSecondary = Color(0xFFFFFFFF)
+private val md_theme_light_secondaryContainer = Color(0xFFCDE7ED)
+private val md_theme_light_onSecondaryContainer = Color(0xFF051F23)
+private val md_theme_light_tertiary = Color(0xFF545D7E)
+private val md_theme_light_onTertiary = Color(0xFFFFFFFF)
+private val md_theme_light_tertiaryContainer = Color(0xFFDBE1FF)
+private val md_theme_light_onTertiaryContainer = Color(0xFF101A37)
+private val md_theme_light_error = Color(0xFFBA1A1A)
+private val md_theme_light_errorContainer = Color(0xFFFFDAD6)
+private val md_theme_light_onError = Color(0xFFFFFFFF)
+private val md_theme_light_onErrorContainer = Color(0xFF410002)
+private val md_theme_light_background = Color(0xFFFBFCFD)
+private val md_theme_light_onBackground = Color(0xFF191C1D)
+private val md_theme_light_surface = Color(0xFFFBFCFD)
+private val md_theme_light_onSurface = Color(0xFF191C1D)
+private val md_theme_light_surfaceVariant = Color(0xFFDBE4E6)
+private val md_theme_light_onSurfaceVariant = Color(0xFF3F484A)
+private val md_theme_light_outline = Color(0xFF6F797B)
+private val md_theme_light_inverseOnSurface = Color(0xFFEFF1F2)
+private val md_theme_light_inverseSurface = Color(0xFF2E3132)
+private val md_theme_light_inversePrimary = Color(0xFF51D7EF)
+private val md_theme_light_surfaceTint = Color(0xFF006876)
+private val md_theme_light_outlineVariant = Color(0xFFBFC8CA)
+private val md_theme_light_scrim = Color(0xFF000000)
+
+private val md_theme_dark_primary = Color(0xFF51D7EF)
+private val md_theme_dark_onPrimary = Color(0xFF00363E)
+private val md_theme_dark_primaryContainer = Color(0xFF004E59)
+private val md_theme_dark_onPrimaryContainer = Color(0xFFA1EFFF)
+private val md_theme_dark_secondary = Color(0xFFB1CBD1)
+private val md_theme_dark_onSecondary = Color(0xFF1C3439)
+private val md_theme_dark_secondaryContainer = Color(0xFF334A50)
+private val md_theme_dark_onSecondaryContainer = Color(0xFFCDE7ED)
+private val md_theme_dark_tertiary = Color(0xFFBCC5EB)
+private val md_theme_dark_onTertiary = Color(0xFF262F4D)
+private val md_theme_dark_tertiaryContainer = Color(0xFF3C4665)
+private val md_theme_dark_onTertiaryContainer = Color(0xFFDBE1FF)
+private val md_theme_dark_error = Color(0xFFFFB4AB)
+private val md_theme_dark_errorContainer = Color(0xFF93000A)
+private val md_theme_dark_onError = Color(0xFF690005)
+private val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6)
+private val md_theme_dark_background = Color(0xFF191C1D)
+private val md_theme_dark_onBackground = Color(0xFFE1E3E3)
+private val md_theme_dark_surface = Color(0xFF191C1D)
+private val md_theme_dark_onSurface = Color(0xFFE1E3E3)
+private val md_theme_dark_surfaceVariant = Color(0xFF3F484A)
+private val md_theme_dark_onSurfaceVariant = Color(0xFFBFC8CA)
+private val md_theme_dark_outline = Color(0xFF899295)
+private val md_theme_dark_inverseOnSurface = Color(0xFF191C1D)
+private val md_theme_dark_inverseSurface = Color(0xFFE1E3E3)
+private val md_theme_dark_inversePrimary = Color(0xFF006876)
+private val md_theme_dark_surfaceTint = Color(0xFF51D7EF)
+private val md_theme_dark_outlineVariant = Color(0xFF3F484A)
+private val md_theme_dark_scrim = Color(0xFF000000)
+
+@Composable
+fun aquaTheme(isDark: Boolean): ColorScheme {
+    return if (isDark) {
+        darkColorScheme(
+            primary = md_theme_dark_primary,
+            onPrimary = md_theme_dark_onPrimary,
+            primaryContainer = md_theme_dark_primaryContainer,
+            onPrimaryContainer = md_theme_dark_onPrimaryContainer,
+            secondary = md_theme_dark_secondary,
+            onSecondary = md_theme_dark_onSecondary,
+            secondaryContainer = md_theme_dark_secondaryContainer,
+            onSecondaryContainer = md_theme_dark_onSecondaryContainer,
+            tertiary = md_theme_dark_tertiary,
+            onTertiary = md_theme_dark_onTertiary,
+            tertiaryContainer = md_theme_dark_tertiaryContainer,
+            onTertiaryContainer = md_theme_dark_onTertiaryContainer,
+            error = md_theme_dark_error,
+            errorContainer = md_theme_dark_errorContainer,
+            onError = md_theme_dark_onError,
+            onErrorContainer = md_theme_dark_onErrorContainer,
+            background = md_theme_dark_background,
+            onBackground = md_theme_dark_onBackground,
+            surface = md_theme_dark_surface,
+            onSurface = md_theme_dark_onSurface,
+            surfaceVariant = md_theme_dark_surfaceVariant,
+            onSurfaceVariant = md_theme_dark_onSurfaceVariant,
+            outline = md_theme_dark_outline,
+            inverseOnSurface = md_theme_dark_inverseOnSurface,
+            inverseSurface = md_theme_dark_inverseSurface,
+            inversePrimary = md_theme_dark_inversePrimary,
+            surfaceTint = md_theme_dark_surfaceTint,
+            outlineVariant = md_theme_dark_outlineVariant,
+            scrim = md_theme_dark_scrim
+        )
+    } else {
+        lightColorScheme(
+            primary = md_theme_light_primary,
+            onPrimary = md_theme_light_onPrimary,
+            primaryContainer = md_theme_light_primaryContainer,
+            onPrimaryContainer = md_theme_light_onPrimaryContainer,
+            secondary = md_theme_light_secondary,
+            onSecondary = md_theme_light_onSecondary,
+            secondaryContainer = md_theme_light_secondaryContainer,
+            onSecondaryContainer = md_theme_light_onSecondaryContainer,
+            tertiary = md_theme_light_tertiary,
+            onTertiary = md_theme_light_onTertiary,
+            tertiaryContainer = md_theme_light_tertiaryContainer,
+            onTertiaryContainer = md_theme_light_onTertiaryContainer,
+            error = md_theme_light_error,
+            errorContainer = md_theme_light_errorContainer,
+            onError = md_theme_light_onError,
+            onErrorContainer = md_theme_light_onErrorContainer,
+            background = md_theme_light_background,
+            onBackground = md_theme_light_onBackground,
+            surface = md_theme_light_surface,
+            onSurface = md_theme_light_onSurface,
+            surfaceVariant = md_theme_light_surfaceVariant,
+            onSurfaceVariant = md_theme_light_onSurfaceVariant,
+            outline = md_theme_light_outline,
+            inverseOnSurface = md_theme_light_inverseOnSurface,
+            inverseSurface = md_theme_light_inverseSurface,
+            inversePrimary = md_theme_light_inversePrimary,
+            surfaceTint = md_theme_light_surfaceTint,
+            outlineVariant = md_theme_light_outlineVariant,
+            scrim = md_theme_light_scrim
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/ui/theme/BlueTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/BlueTheme.kt
similarity index 99%
rename from app/src/main/java/com/acclorite/books_history/ui/theme/BlueTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/theme/BlueTheme.kt
index 7d45c48f..e3e09f53 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/theme/BlueTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/BlueTheme.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui.theme
+package ua.acclorite.book_story.ui.theme
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
diff --git a/app/src/main/java/com/acclorite/books_history/ui/theme/GreenTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/GreenTheme.kt
similarity index 99%
rename from app/src/main/java/com/acclorite/books_history/ui/theme/GreenTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/theme/GreenTheme.kt
index 024c1042..19cebb58 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/theme/GreenTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/GreenTheme.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui.theme
+package ua.acclorite.book_story.ui.theme
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
diff --git a/app/src/main/java/com/acclorite/books_history/ui/theme/PinkTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/PinkTheme.kt
similarity index 99%
rename from app/src/main/java/com/acclorite/books_history/ui/theme/PinkTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/theme/PinkTheme.kt
index d7637112..36a0f03a 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/theme/PinkTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/PinkTheme.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui.theme
+package ua.acclorite.book_story.ui.theme
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
diff --git a/app/src/main/java/com/acclorite/books_history/ui/theme/PurpleTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/PurpleTheme.kt
similarity index 99%
rename from app/src/main/java/com/acclorite/books_history/ui/theme/PurpleTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/theme/PurpleTheme.kt
index 8db93d43..1c31f974 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/theme/PurpleTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/PurpleTheme.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui.theme
+package ua.acclorite.book_story.ui.theme
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
diff --git a/app/src/main/java/com/acclorite/books_history/ui/theme/RedTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/RedTheme.kt
similarity index 99%
rename from app/src/main/java/com/acclorite/books_history/ui/theme/RedTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/theme/RedTheme.kt
index 43d2261f..bc98c65c 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/theme/RedTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/RedTheme.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui.theme
+package ua.acclorite.book_story.ui.theme
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
diff --git a/app/src/main/java/com/acclorite/books_history/ui/theme/YellowTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/YellowTheme.kt
similarity index 99%
rename from app/src/main/java/com/acclorite/books_history/ui/theme/YellowTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/theme/YellowTheme.kt
index 5d1e46ee..a601635d 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/theme/YellowTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/YellowTheme.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui.theme
+package ua.acclorite.book_story.ui.theme
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
diff --git a/app/src/main/java/com/acclorite/books_history/util/BookApplication.kt b/app/src/main/java/ua/acclorite/book_story/util/BookApplication.kt
similarity index 75%
rename from app/src/main/java/com/acclorite/books_history/util/BookApplication.kt
rename to app/src/main/java/ua/acclorite/book_story/util/BookApplication.kt
index efc2af1c..d203292c 100644
--- a/app/src/main/java/com/acclorite/books_history/util/BookApplication.kt
+++ b/app/src/main/java/ua/acclorite/book_story/util/BookApplication.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.util
+package ua.acclorite.book_story.util
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
diff --git a/app/src/main/java/com/acclorite/books_history/util/Constants.kt b/app/src/main/java/ua/acclorite/book_story/util/Constants.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/util/Constants.kt
rename to app/src/main/java/ua/acclorite/book_story/util/Constants.kt
index 755b6f59..7103c7dc 100644
--- a/app/src/main/java/com/acclorite/books_history/util/Constants.kt
+++ b/app/src/main/java/ua/acclorite/book_story/util/Constants.kt
@@ -1,14 +1,14 @@
-package com.acclorite.books_history.util
+package ua.acclorite.book_story.util
 
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.domain.model.FontWithName
-import com.acclorite.books_history.ui.Theme
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.domain.model.FontWithName
+import ua.acclorite.book_story.ui.Theme
 
 object Constants {
 
@@ -39,11 +39,12 @@ object Constants {
     val THEMES = listOf(
         Pair(Theme.DYNAMIC, UIText.StringResource(R.string.dynamic_theme)),
         Pair(Theme.BLUE, UIText.StringResource(R.string.blue_theme)),
-        Pair(Theme.PURPLE, UIText.StringResource(R.string.purple_theme)),
         Pair(Theme.GREEN, UIText.StringResource(R.string.green_theme)),
+        Pair(Theme.RED, UIText.StringResource(R.string.red_theme)),
+        Pair(Theme.PURPLE, UIText.StringResource(R.string.purple_theme)),
         Pair(Theme.PINK, UIText.StringResource(R.string.pink_theme)),
         Pair(Theme.YELLOW, UIText.StringResource(R.string.yellow_theme)),
-        Pair(Theme.RED, UIText.StringResource(R.string.red_theme)),
+        Pair(Theme.AQUA, UIText.StringResource(R.string.aqua_theme)),
     )
 
     // Fonts for Reader
@@ -176,7 +177,7 @@ object Constants {
     )
 
     val EMPTY_BOOK = Book(
-        null,
+        0,
         "",
         UIText.StringValue(""),
         null,
diff --git a/app/src/main/java/com/acclorite/books_history/util/DataStoreConstants.kt b/app/src/main/java/ua/acclorite/book_story/util/DataStoreConstants.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/util/DataStoreConstants.kt
rename to app/src/main/java/ua/acclorite/book_story/util/DataStoreConstants.kt
index f5dd2f5c..d350dfac 100644
--- a/app/src/main/java/com/acclorite/books_history/util/DataStoreConstants.kt
+++ b/app/src/main/java/ua/acclorite/book_story/util/DataStoreConstants.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.util
+package ua.acclorite.book_story.util
 
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.intPreferencesKey
diff --git a/app/src/main/java/com/acclorite/books_history/util/Resource.kt b/app/src/main/java/ua/acclorite/book_story/util/Resource.kt
similarity index 87%
rename from app/src/main/java/com/acclorite/books_history/util/Resource.kt
rename to app/src/main/java/ua/acclorite/book_story/util/Resource.kt
index df48dacd..1edb7509 100644
--- a/app/src/main/java/com/acclorite/books_history/util/Resource.kt
+++ b/app/src/main/java/ua/acclorite/book_story/util/Resource.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.util
+package ua.acclorite.book_story.util
 
 sealed class Resource<T>(val data: T? = null, val message: UIText? = null) {
     class Success<T>(data: T?) : Resource<T>(data)
diff --git a/app/src/main/java/com/acclorite/books_history/util/UIText.kt b/app/src/main/java/ua/acclorite/book_story/util/UIText.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/util/UIText.kt
rename to app/src/main/java/ua/acclorite/book_story/util/UIText.kt
index c1717790..c859b54d 100644
--- a/app/src/main/java/com/acclorite/books_history/util/UIText.kt
+++ b/app/src/main/java/ua/acclorite/book_story/util/UIText.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.util
+package ua.acclorite.book_story.util
 
 import android.content.Context
 import androidx.annotation.StringRes
diff --git a/app/src/main/res/mipmap-anydpi-v26/app_icon.xml b/app/src/main/res/mipmap-anydpi/app_icon.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/app_icon.xml
rename to app/src/main/res/mipmap-anydpi/app_icon.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/app_icon_round.xml b/app/src/main/res/mipmap-anydpi/app_icon_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/app_icon_round.xml
rename to app/src/main/res/mipmap-anydpi/app_icon_round.xml
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index c7ca581f..6e172b27 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -17,6 +17,7 @@
     <string name="delete_books">Видалити книги?</string>
     <string name="delete_book">Видалити книгу?</string>
     <string name="move_book">Перемістити книгу?</string>
+    <string name="delete_history">Видалити історію читання?</string>
 
     <!-- Dialog Descriptions -->
     <string name="storage_permission_description">
@@ -43,6 +44,9 @@
         Виберіть категорію, в яку ви хочете перемістити цю книгу.
         Ця книга буде переміщена в обрану категорію.
     </string>
+    <string name="delete_history_description">
+        Це видалить всю історію з бази даних.
+    </string>
 
     <!-- Errors -->
     <string name="error_permission">
@@ -65,6 +69,10 @@
     <string name="library_empty">
         Читайте ваші улюблені книги та сортуйте їх між категоріями
     </string>
+    <string name="history_empty">
+        Нехай ваша остання прочитана книга відкриє перед
+        вами сторінки нової великої історії вашого читацького шляху
+    </string>
 
     <!-- Query strings -->
     <string name="selected_items_count_query">%1$s обрано</string>
@@ -87,10 +95,12 @@
     <string name="go_back">Назад</string>
     <string name="move_to_read">Перемістити цю книгу в \"Прочитано\"</string>
     <string name="back_to_library">Назад в Бібліотеку</string>
+    <string name="undo">Скасувати</string>
 
     <!-- Items -->
     <string name="files">файли</string>
     <string name="books">книги</string>
+    <string name="history">історію</string>
 
     <!-- Book -->
     <string name="unknown_author">Невідомий</string>
@@ -145,13 +155,14 @@
     <string name="font_style_normal">Нормальний</string>
 
     <!-- Themes -->
-    <string name="dynamic_theme">Хаос</string>
+    <string name="dynamic_theme">Меркурій</string>
     <string name="blue_theme">Нептун</string>
-    <string name="purple_theme">Супернова</string>
     <string name="green_theme">Земля</string>
-    <string name="pink_theme">Пульсар</string>
-    <string name="yellow_theme">Венера</string>
     <string name="red_theme">Марс</string>
+    <string name="purple_theme">Юпітер</string>
+    <string name="pink_theme">Сатурн</string>
+    <string name="yellow_theme">Венера</string>
+    <string name="aqua_theme">Уран</string>
 
     <!-- Toast messages -->
     <string name="press_again_toast">Натисніть ще раз, щоб вийти</string>
@@ -165,6 +176,10 @@
     <string name="book_deleted">Ця книга була успішно видалена.</string>
     <string name="book_moved">Ця книга була успішно переміщена.</string>
     <string name="copied">Скопійовано</string>
+    <string name="history_deleted">Історія була успішно видалена.</string>
+
+    <!-- Snackbar messages -->
+    <string name="history_element_deleted">Елемент історії був успішно видалений.</string>
 
     <!-- DropDown properties -->
     <string name="move_this_book">Перемістити</string>
@@ -189,4 +204,8 @@
     <!-- Font families -->
     <string name="default_font">За замовчуванням</string>
 
+    <!-- History -->
+    <string name="today">Сьогодні</string>
+    <string name="yesterday">Вчора</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 707607fb..d4206141 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <!-- Basic Strings -->
-    <string name="app_version" translatable="false">0.6.0</string>
-    <string name="app_name">Book\'s History</string>
+    <string name="app_version" translatable="false">0.8.0</string>
+    <string name="app_name">Book\'s Story</string>
 
     <!-- Screens -->
     <string name="library_screen">Library</string>
@@ -18,6 +18,7 @@
     <string name="delete_books">Delete books?</string>
     <string name="delete_book">Delete book?</string>
     <string name="move_book">Move book?</string>
+    <string name="delete_history">Delete reading history?</string>
 
     <!-- Dialog Descriptions -->
     <string name="storage_permission_description">
@@ -44,6 +45,9 @@
         Choose the category to which you want to move this book.
         This book will be moved to the selected category.
     </string>
+    <string name="delete_history_description">
+        It will delete the whole history from the database.
+    </string>
 
     <!-- Errors -->
     <string name="error_permission">
@@ -66,6 +70,9 @@
     <string name="library_empty">
         Read your favorite books and sort them between categories
     </string>
+    <string name="history_empty">
+        Let your last book you read open the pages of a new great story of your reading journey
+    </string>
 
     <!-- Query strings -->
     <string name="selected_items_count_query">%1$s selected</string>
@@ -88,10 +95,12 @@
     <string name="go_back">Go back</string>
     <string name="move_to_read">Move this book to \"Already Read\"</string>
     <string name="back_to_library">Back to Library</string>
+    <string name="undo">Undo</string>
 
     <!-- Items -->
     <string name="files">files</string>
     <string name="books">books</string>
+    <string name="history">history</string>
 
     <!-- Book -->
     <string name="unknown_author">Unknown</string>
@@ -146,13 +155,14 @@
     <string name="font_style_normal">Normal</string>
 
     <!-- Themes -->
-    <string name="dynamic_theme">Chaos</string>
+    <string name="dynamic_theme">Mercury</string>
     <string name="blue_theme">Neptune</string>
-    <string name="purple_theme">Supernova</string>
     <string name="green_theme">Earth</string>
-    <string name="pink_theme">Pulsar</string>
-    <string name="yellow_theme">Venus</string>
     <string name="red_theme">Mars</string>
+    <string name="purple_theme">Jupiter</string>
+    <string name="pink_theme">Saturn</string>
+    <string name="yellow_theme">Venus</string>
+    <string name="aqua_theme">Uranus</string>
 
     <!-- Toast messages -->
     <string name="press_again_toast">Press back again to exit</string>
@@ -166,6 +176,10 @@
     <string name="book_deleted">This book was successfully deleted.</string>
     <string name="book_moved">This book was successfully moved.</string>
     <string name="copied">Copied</string>
+    <string name="history_deleted">History was successfully deleted.</string>
+
+    <!-- Snackbar messages -->
+    <string name="history_element_deleted">History element was successfully deleted.</string>
 
     <!-- DropDown properties -->
     <string name="move_this_book">Move</string>
@@ -190,4 +204,8 @@
     <!-- Font families -->
     <string name="default_font">Default</string>
 
+    <!-- History -->
+    <string name="today">Today</string>
+    <string name="yesterday">Yesterday</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 5882a10a..972f848f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Theme.BooksHistoryResurrection" parent="android:Theme.Material.Light.NoActionBar">
+    <style name="Theme.BooksHistoryResurrection" parent="Theme.AppCompat.NoActionBar">
         <item name="android:forceDarkAllowed" tools:ignore="NewApi">false</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
diff --git a/app/src/test/java/com/acclorite/books_history/ExampleUnitTest.kt b/app/src/test/java/com/acclorite/books_history/ExampleUnitTest.kt
deleted file mode 100644
index 949d8f7a..00000000
--- a/app/src/test/java/com/acclorite/books_history/ExampleUnitTest.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.acclorite.books_history
-
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
diff --git a/app/strings.xml b/app/strings.xml
deleted file mode 100644
index 58cbc499..00000000
--- a/app/strings.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<resources>
-    <!-- Basic Strings -->
-    <string name="app_name">Історія Книги</string>
-
-    <!-- Screens -->
-    <string name="library_screen">Бібліотека</string>
-    <string name="history_screen">Історія</string>
-    <string name="browse_screen">Оглянути</string>
-    <string name="settings_screen">Налаштування</string>
-    <string name="about_screen">Про застосунок</string>
-    <string name="help_screen">Допомога</string>
-
-    <!-- Dialog Labels -->
-    <string name="storage_permission">Надати Дозвіл?</string>
-    <string name="add_books">Додати ці книги?</string>
-
-    <!-- Dialog Descriptions -->
-    <string name="storage_permission_description">
-        Нам потрібен дозвіл на сховище, щоб просканувати вашу теку Завантажень.
-        Без цього дозволу ви не зможете додати книгу.
-    </string>
-    <string name="add_books_description">
-        Ви можете вибрати книги, які хочете додати.
-        Ви зможете відредагувати Назву та Обкладинку книги пізніше.
-    </string>
-
-    <!-- Errors -->
-    <string name="error_permission">
-        Нам потрібен дозвіл на сховище, щоб просканувати вашу теку Завантажень та отримати книги
-    </string>
-
-    <!-- Is Empty messages -->
-    <string name="browse_empty">
-        Розширюйте книжковий арсенал бібліотеки своїми завантаженнями
-    </string>
-
-    <!-- Query strings -->
-    <string name="selected_items_count_query">%1$s обрано</string>
-    <string name="search_query">Знайти %1$s...</string>
-
-    <!-- Action Texts -->
-    <string name="cancel">Відмінити</string>
-    <string name="grant">Надати</string>
-    <string name="grant_permission">Надати дозвіл</string>
-    <string name="get_help">Мені потрібна допомога</string>
-    <string name="add">Додати</string>
-
-    <!-- Items -->
-    <string name="files">файли</string>
-
-    <!-- Book -->
-    <string name="unknown_author">Невідомий</string>
-
-    <!-- Tabs -->
-    <string name="reading_tab">Читаю</string>
-    <string name="already_read_tab">Прочитано</string>
-    <string name="planning_tab">Планую</string>
-    <string name="dropped_tab">Кинуто</string>
-
-    <!-- Settings categories -->
-    <string name="general_settings">Головні</string>
-    <string name="general_settings_desc">Мова застосунку</string>
-
-    <!-- Settings options -->
-    <string name="language_option">Мова застосунку</string>
-
-</resources>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 3c5031eb..2e7e7ed8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,5 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+org.gradle.configuration-cache=true
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b921c451..5e9a413d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -19,6 +19,6 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "Book's History Resurrection"
+rootProject.name = "Book's Story"
 include(":app")
  
\ No newline at end of file