Commit 78b28d4
committed
Merge branch 'develop' into BOOK-167-feature/#69
# Conflicts:
# feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/component/BookRegisterBottomSheet.kt
# feature/search/src/main/res/values/strings.xml124 files changed
Lines changed: 3810 additions & 477 deletions
File tree
- core
- common
- src/main
- kotlin/com/ninecraft/booket/core/common
- constants
- extensions
- util
- res/values
- datastore
- api
- src/main/kotlin/com/ninecraft/booket/core/datastore/api/datasource
- impl
- src/main/kotlin/com/ninecraft/booket/core/datastore/impl/datasource
- data
- api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository
- impl/src/main/kotlin/com/ninecraft/booket/core/data/impl
- di
- mapper
- repository
- designsystem/src/main
- kotlin/com/ninecraft/booket/core/designsystem
- component
- button
- textfield
- theme
- res
- drawable
- values
- model/src/main/kotlin/com/ninecraft/booket/core/model
- network/src/main/kotlin/com/ninecraft/booket/core/network
- di
- request
- response
- service
- ui/src/main/kotlin/com/ninecraft/booket/core/ui/component
- feature
- detail
- src/main
- kotlin/com/ninecraft/booket/feature/detail
- book
- component
- record
- component
- res/values
- home
- src/main
- kotlin/com/ninecraft/booket/feature/home
- component
- res
- drawable
- values
- library/src/main/kotlin/com/ninecraft/booket/feature/library
- component
- login/src/main/kotlin/com/ninecraft/booket/feature
- login
- termsagreement
- component
- main/src/main
- kotlin/com/ninecraft/booket/feature/main
- splash
- res/drawable
- onboarding/src/main/kotlin/com/ninecraft/booket/feature/onboarding
- component
- record/src/main
- kotlin/com/ninecraft/booket/feature/record
- component
- ocr/component
- register
- step
- res/values
- screens/src/main/kotlin/com/ninecraft/booket/feature/screens
- search/src/main
- kotlin/com/ninecraft/booket/feature/search/book
- component
- res/values
- settings/src/main/kotlin/com/ninecraft/booket/feature/settings
- webview/src/main/kotlin/com/ninecraft/booket/feature/webview
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| 19 | + | |
| 20 | + | |
19 | 21 | | |
20 | 22 | | |
21 | 23 | | |
Lines changed: 24 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
5 | | - | |
| 4 | + | |
| 5 | + | |
6 | 6 | | |
Lines changed: 22 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
Lines changed: 31 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
Lines changed: 7 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
3 | 6 | | |
4 | 7 | | |
5 | 8 | | |
6 | 9 | | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
7 | 14 | | |
Lines changed: 7 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
Lines changed: 13 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
3 | 4 | | |
4 | 5 | | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
9 | | - | |
| 10 | + | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
0 commit comments