Commit 076b45b
committed
Merge branch 'master' into test/calculator-widget-device-tests
# Conflicts:
# app/src/androidTest/java/to/bitkit/ui/screens/widgets/blocks/BlocksEditScreenTest.kt
# app/src/androidTest/java/to/bitkit/ui/screens/widgets/blocks/BlocksPreviewScreenTest.kt
# app/src/androidTest/java/to/bitkit/ui/screens/widgets/facts/FactsEditScreenTest.kt
# app/src/androidTest/java/to/bitkit/ui/screens/widgets/facts/FactsPreviewScreenTest.kt132 files changed
Lines changed: 5629 additions & 4542 deletions
File tree
- .github/workflows
- app/src
- androidTest/java/to/bitkit/ui/screens/widgets
- blocks
- facts
- headlines
- weather
- main
- java/to/bitkit
- appwidget
- config
- model
- ui
- blocks
- components
- facts
- headlines
- price
- weather
- data
- dto
- widgets
- env
- models/widget
- repositories
- services
- ui
- components
- screens
- contacts
- transfer
- wallets
- activity/components
- receive
- widgets
- blocks
- components
- facts
- headlines
- price
- weather
- settings
- sheets
- theme
- utils
- viewmodels
- res
- drawable
- layout
- values
- xml
- test/java/to/bitkit
- repositories
- viewmodels
- changelog.d/next
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 | |
|---|---|---|---|
| |||
305 | 305 | | |
306 | 306 | | |
307 | 307 | | |
| 308 | + | |
308 | 309 | | |
309 | 310 | | |
310 | 311 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
| |||
25 | 26 | | |
26 | 27 | | |
27 | 28 | | |
| 29 | + | |
28 | 30 | | |
29 | 31 | | |
30 | 32 | | |
| |||
Lines changed: 67 additions & 105 deletions
Large diffs are not rendered by default.
Lines changed: 0 additions & 355 deletions
This file was deleted.
0 commit comments