Commit 677da72
committed
Merge remote-tracking branch 'origin/master' into feature/timed_refresh
# Conflicts:
# app/src/main/java/one/mixin/android/repository/Web3Repository.kt
# app/src/main/java/one/mixin/android/ui/common/LoginVerifyBottomSheetDialogFragment.kt
# app/src/main/java/one/mixin/android/ui/tip/wc/sessionproposal/SessionProposalPage.kt
# app/src/main/java/one/mixin/android/ui/tip/wc/sessionproposal/SessionProposalViewModel.kt
# app/src/main/java/one/mixin/android/ui/tip/wc/sessionrequest/SessionRequestViewModel.kt
# app/src/main/java/one/mixin/android/ui/wallet/ClassicWalletFragment.kt
# app/src/main/java/one/mixin/android/ui/wallet/PrivacyWalletFragment.kt
# app/src/main/java/one/mixin/android/ui/wallet/TransactionsFragment.kt
# app/src/main/java/one/mixin/android/ui/wallet/WalletFragment.ktFile tree
214 files changed
+10031
-1792
lines changed- app
- libs
- schemas/one.mixin.android.db.MixinDatabase
- src
- main
- java/one/mixin/android
- api
- request
- web3
- response
- web3
- service
- compose
- crypto
- db
- provider
- web3/vo
- di
- event
- extension
- job
- net
- repository
- session
- tip/wc
- ui
- address
- component
- page
- common
- profile
- refresh
- contacts
- conversation
- link
- group
- home
- inscription
- web3
- components
- stake
- swap
- landing
- components
- logs
- search
- setting
- tip
- wc
- compose
- sessionproposal
- sessionrequest
- transfer
- vo
- wallet
- adapter
- components
- fiatmoney
- transfer
- widget
- viewmodel
- web
- util
- debug
- vo/safe
- web3
- details
- js
- receive
- swap
- widget
- imageeditor
- linktext
- worker
- res
- drawable
- layout-v26
- layout
- values-zh-rCN
- values
- test/java/one/mixin/android/ui/group
- gradle/wrapper
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
214 files changed
+10031
-1792
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
14 | 15 | | |
15 | | - | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
| 32 | + | |
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| |||
219 | 219 | | |
220 | 220 | | |
221 | 221 | | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
222 | 226 | | |
223 | 227 | | |
224 | 228 | | |
| |||
416 | 420 | | |
417 | 421 | | |
418 | 422 | | |
419 | | - | |
| 423 | + | |
420 | 424 | | |
421 | 425 | | |
422 | 426 | | |
| |||
506 | 510 | | |
507 | 511 | | |
508 | 512 | | |
| 513 | + | |
509 | 514 | | |
510 | 515 | | |
511 | 516 | | |
| |||
551 | 556 | | |
552 | 557 | | |
553 | 558 | | |
554 | | - | |
555 | | - | |
556 | | - | |
557 | | - | |
558 | | - | |
559 | | - | |
560 | | - | |
561 | 559 | | |
562 | | - | |
563 | | - | |
564 | | - | |
565 | | - | |
566 | | - | |
567 | | - | |
568 | | - | |
569 | | - | |
570 | | - | |
Binary file not shown.
0 commit comments