Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/4.14 #27

Open
wants to merge 196 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
196 commits
Select commit Hold shift + click to select a range
910b086
Nil currencyCode crash fix
michaelibrd Jul 29, 2021
a1d7d57
Merge branch 'michael/nil-currency-fix' into 'develop'
Jul 29, 2021
713dd01
DROID-2013: Adds flipper debug tool
Jul 29, 2021
13d5208
Merge branch 'debug/DROID-2013-add-flipper' into 'develop'
Jul 29, 2021
4087e11
DROID-1955: Lazy init BrdPreferences
DrewCarlson Jul 29, 2021
b461d67
Merge branch 'drew/DROID-1955' into 'develop'
DrewCarlson Jul 29, 2021
87fbb00
adding plists back so that xcode compiles after checkout
michaelibrd Jul 30, 2021
184a7a9
Merge branch 'michael/adding-plists-to-repo' into 'develop'
Jul 30, 2021
dcf1596
DROID-2014: Removes BaseTextView and moves line spacing attr to styles
Aug 3, 2021
5c27b49
Merge branch 'amit/DROID-2014' into 'develop'
Aug 3, 2021
da739f2
DROID-2016: Moves ApplicationScope from static ref to KodeIn Dependen…
Aug 3, 2021
9c14eec
Merge branch 'amit/DROID-2016' into 'develop'
Aug 3, 2021
7790512
DROID-2017: Configures and adds Ktlint dependency. Also enables pre-…
Aug 9, 2021
847452b
Merge branch 'amit/DROID-2017' into 'develop'
Aug 9, 2021
6681fec
Merge branch 'release/4.12' into 'main'
Aug 16, 2021
787091f
Merge branch 'main' into drew/merge-main
DrewCarlson Aug 16, 2021
b5cbb00
Merge branch 'drew/merge-main' into 'develop'
DrewCarlson Aug 16, 2021
79dae1c
Update to WalletKit 0.10.0 and AGP 7
DrewCarlson May 13, 2021
05aa7e5
iOS walletkit 0.10.0 interface update
ewerx Aug 4, 2021
b2d4f8d
Save android CI report artifacts
DrewCarlson Aug 16, 2021
b39a996
Update ktlint rules
DrewCarlson Aug 16, 2021
e84759c
Remove patch for 'None' pair rate
DrewCarlson Aug 3, 2021
c505407
Merge branch 'drew/update-walletkit' into 'develop'
DrewCarlson Aug 17, 2021
acb571c
Merge branch 'bug/unexpected-currency-code-crash-fix' into 'develop'
Aug 17, 2021
fc39ede
IOS-1710: iOS project and warnings clean up
Aug 17, 2021
bdab9a5
Merge branch 'michael/cleanup' into 'develop'
Aug 17, 2021
d9a3d07
Doge coin support
Aug 17, 2021
912078e
Merge branch 'feature/doge' into 'develop'
Aug 17, 2021
1dae3ff
Fix walletkit transfer event usage
DrewCarlson Aug 18, 2021
0e7ba3c
Merge branch 'drew/android-compilation' into 'develop'
DrewCarlson Aug 18, 2021
5121552
Merge branch 'drew/release-4.12-sync' into 'release/4.12'
DrewCarlson Aug 19, 2021
beff31c
DROID-1991: Native support article UI
DrewCarlson Aug 10, 2021
04dff47
Update to core-9.0.7
DrewCarlson Aug 19, 2021
24ab618
Update strings
DrewCarlson Aug 19, 2021
c98544a
Add View Receipt button
DrewCarlson Aug 18, 2021
d4d6333
Cleanup trade transaction flow
DrewCarlson Aug 19, 2021
453587d
Add order complete confetti
DrewCarlson Aug 19, 2021
3ce72c2
Fix crash when closing Exchange
DrewCarlson Aug 19, 2021
b2565e3
Ellipsize to address on confirm dialog
DrewCarlson Aug 19, 2021
67c97de
Handle transaction error, render error dialogs
DrewCarlson Aug 19, 2021
0912be3
Trim currency code from trade quote
DrewCarlson Aug 19, 2021
f8c1a55
Bump android version to build 3
DrewCarlson Aug 19, 2021
da51f76
Update rewards address when hydra is activated
DrewCarlson Aug 19, 2021
8e62e45
Add BrowserController for user web pages
DrewCarlson Aug 19, 2021
6d2a135
Handle web page email urls
DrewCarlson Aug 19, 2021
fd81495
Add exchange settings region flags
DrewCarlson Aug 20, 2021
6d7073e
Move support close button
DrewCarlson Aug 20, 2021
088b7c0
Fix exchange settings title
DrewCarlson Aug 20, 2021
790be92
Fix exchange asset list text overlap
DrewCarlson Aug 20, 2021
3d78bcc
Update brd wallet rewards button
DrewCarlson Aug 20, 2021
83d5cfc
Merge branch 'release/4.12.2' into 'main'
Aug 23, 2021
0661408
merging main into develop
michaelibrd Aug 23, 2021
d2e30d1
updating resources
michaelibrd Aug 23, 2021
e8a02b3
Merge branch 'michael/merge-conflicts-from-main-to-develp' into 'deve…
Aug 23, 2021
a7bb6d1
DROID-2048: Display delivery estimate after order
DrewCarlson Aug 24, 2021
80faa35
DROID-2049: Display fallback fee value on order complete
DrewCarlson Aug 24, 2021
5a5037c
DROID-2044: Design Improvements for Buy and List Screens
Aug 24, 2021
db9a034
Update MarginItemDecoration to take an Int param and convert to DP
Aug 24, 2021
d43070b
Handling new error states
michaelibrd Aug 26, 2021
1cb6653
Merge branch 'michael/new-error-states' into 'drew/android-release-4.12'
Aug 26, 2021
11ae388
Fixing qr image
Aug 26, 2021
38b2638
Merge branch 'feature/doge' into 'develop'
Aug 26, 2021
3647027
BlockClock
Aug 26, 2021
854e1fa
Merge branch 'michael/blockclock' into 'develop'
Aug 26, 2021
1cdfbd8
Update exit checkout strings
DrewCarlson Aug 26, 2021
1029a9c
Fix issue with Formatter Exception. Now escapes currencyCode String …
Aug 26, 2021
16202ab
DROID-2045: Design Improvements for Trade Screens
Aug 26, 2021
341283a
Run number formatter tests on Android
DrewCarlson Aug 26, 2021
7ba2814
DROID-2059: Navigate back to Home when clicking `Great` CTA on trade …
Aug 27, 2021
52a4654
Apply 1 suggestion(s) to 1 file(s)
DrewCarlson Aug 27, 2021
ff8ab38
DROID-2056: Add trade transaction metadata
DrewCarlson Aug 27, 2021
7311c2e
DROID-2047: Various Buy/Trade string fixes
DrewCarlson Aug 27, 2021
eaaf3fe
DROID-2057: Fix tab selection on Trade From/To Tabs
Aug 27, 2021
7f4676d
Update formatted quote amount for trade UI
DrewCarlson Aug 27, 2021
7ce346e
Add blue pill background for PinPad Keyboard button feedback
Aug 27, 2021
cc96d58
Release-4.12.0.4
Aug 27, 2021
cec67e7
DROID-2054: Hide `From` Currency Fiat from trade screen, if pair not …
Aug 30, 2021
465e7ac
DROID-2061: Fix primary wallet balance check
DrewCarlson Aug 30, 2021
87ccfd0
Support changing ExchangeController modes
DrewCarlson Aug 30, 2021
f0f6177
providing default country and cod
michaelibrd Aug 20, 2021
5294a94
Locale mapping fix
michaelibrd Aug 18, 2021
631c671
Release-4.12.0.5
Aug 30, 2021
0ae55b2
DROID-2060: Replace MetadataManager lookup
DrewCarlson Aug 31, 2021
b3943a5
DROID-2045: Design Improvements for Trade Flow
Aug 31, 2021
8becb74
Remove mode Extension variable, in favor of class variable.
Aug 31, 2021
c9347e8
Fix margin for fiat currency estimate on `To` Asset
Aug 31, 2021
0d3bef1
Release-4.12.0.6
Aug 31, 2021
df91f63
fixing merge conflicts
michaelibrd Sep 1, 2021
542eac4
Merge branch 'michael/blockclock' into 'develop'
Sep 1, 2021
2123933
Feature/widgets 2
Sep 1, 2021
f92aeb7
Merge branch 'feature/widgets-2' into 'develop'
Sep 1, 2021
bb0d30c
DROID-2062: Allow document uploads in partner web flows
Sep 1, 2021
d03fe2a
Change replay usage on SharedFlow to extraBufferCapacity
Sep 1, 2021
3b1712f
DROID-2060: Support retry for transfer creation error
DrewCarlson Sep 1, 2021
5759edf
Release-4.12.0.7
Sep 1, 2021
ddc2e6e
Fix hit box of the `FROM` asset on Trade Screen
Sep 2, 2021
2459c66
Release-4.12.0.8
Sep 2, 2021
243bd76
Merge branch 'drew/android-release-4.12' into 'release/4.12'
DrewCarlson Sep 2, 2021
504a22a
Merge branch 'release/4.12' into 'main'
DrewCarlson Sep 2, 2021
7fa6c15
Merge branch 'main' into drew/merge-main
DrewCarlson Sep 3, 2021
728dff9
Update walletkit
DrewCarlson Sep 3, 2021
6635ed0
Merge branch 'drew/merge-main' into 'develop'
DrewCarlson Sep 3, 2021
7e34efc
DROID-2043: Update Kodein to 7.6
Sep 3, 2021
6fb3e69
Merge branch 'amit/DROID-2043' into 'develop'
Sep 3, 2021
7e7ffdd
Testing Slack Release posting to channel
Sep 4, 2021
2d78196
Merge branch 'amit/slack_rls_post' into 'develop'
Sep 4, 2021
f57ec6a
DROID-2071: Calls setDefaultWordList earlier in app startup to ensure…
Sep 7, 2021
2d042eb
DROID-2072: Fix issues with BrdRewards not being active
Sep 7, 2021
7d5cd28
Release-4.12.0.9
Sep 7, 2021
4c8b72b
Merge branch 'amit/fix_wallet_keys_refresh' into 'release/4.12'
Sep 7, 2021
16e616b
IOS-1949 - incorrect 'invalid address' error when pasting address int…
brd-jwheeler Sep 7, 2021
d6adc9e
Merge branch 'jw/ios-1949' into 'develop'
brd-jwheeler Sep 8, 2021
df808d0
IOS-1943 - Adding Simplex exchange icon
brd-jwheeler Sep 8, 2021
5cdc06e
Merge branch 'jw/ios-1943' into 'develop'
brd-jwheeler Sep 8, 2021
5b54a6d
DROID-2074 - Avoid any BASE_URL with duplicated schema.
Sep 8, 2021
4c049e7
Release-4.12.0.10
Sep 8, 2021
7fcc114
Merge branch 'bugfix/DROID-2074' into 'release/4.12'
Sep 8, 2021
48148d9
Merge branch 'release/4.12' into 'main'
Sep 8, 2021
e8ac61b
Merge branch 'main' into 'develop'
Sep 8, 2021
f623fa9
DROID-2027: Add Simplex Quote Icon Asset
Sep 9, 2021
941a38a
Update WalletKit to Beta 5
brd-jwheeler Sep 10, 2021
74eb599
Merge branch 'jw/release/4.13.0-core-5' into 'develop'
brd-jwheeler Sep 10, 2021
5a445a9
Merge branch 'feature/DROID-2027' into 'develop'
Sep 10, 2021
0c90432
Update wallet kit to 0.10.0-beta.6
Sep 10, 2021
51b9f8f
build ios-4.13.0.6
brd-jwheeler Sep 13, 2021
3842c79
Merge branch 'jw/release/ios-4.13.0.6' into 'release/4.13.0'
brd-jwheeler Sep 13, 2021
468bb61
ITunes connect localisation warning fix
Sep 13, 2021
70620f7
Merge branch 'michael/localization-warning-fix' into 'release/4.13.0'
Sep 13, 2021
f76777c
DROID-2083: Only dispatch ChildController render if attached
DrewCarlson Sep 13, 2021
5e9c0a5
Michael/widget crash fix
Sep 14, 2021
ea7f426
Merge branch 'michael/widget-crash-fix' into 'release/4.13.0'
Sep 14, 2021
531608e
Fixing start motion crash fix
michaelibrd Sep 14, 2021
62d0299
Asset cell crash fix
michaelibrd Sep 14, 2021
73db93a
Merge branch 'michael/asset-cell-crash' into 'release/4.13.0'
Sep 15, 2021
48d53da
Merge branch 'michael/gradient_motion_fix' into 'release/4.13.0'
Sep 15, 2021
b059574
ltc barcode fix
michaelibrd Sep 15, 2021
6b06dfa
DROID-2070: Hide Browser controls for Rewards and OrderHistory Screens
Sep 15, 2021
66edc60
Merge branch 'bugfix/DROID-2070' into 'release/4.13.0'
Sep 15, 2021
55c500d
Merge branch 'main' into 'release/4.12.1'
DrewCarlson Sep 15, 2021
aac9773
Merge branch 'michael/ios-1967-ltc-barcode' into 'release/4.13.0'
Sep 15, 2021
d3acb41
Merge branch 'drew/DROID-2083' into 'release/4.12.1'
DrewCarlson Sep 15, 2021
e709cdd
Possible fix for empty trade screen crash
michaelibrd Sep 15, 2021
244493a
Bump version to 4.12.1 build 1
DrewCarlson Sep 15, 2021
fb233dc
Merge branch 'michael/empty-trade-screen-crash' into 'release/4.13.0'
Sep 15, 2021
49c2fd9
Merge branch 'drew/bump-version' into 'release/4.12.1'
DrewCarlson Sep 15, 2021
ba78488
adding url schemes to info.plist
michaelibrd Sep 15, 2021
f5535a6
Fixing trade formatting issue
michaelibrd Sep 15, 2021
4f4b316
Merge branch 'michael/url-schemes-fix' into 'release/4.13.0'
Sep 15, 2021
5c192fe
Merge branch 'michael/trade-detail-format-fix' into 'release/4.13.0'
Sep 15, 2021
b2487a5
build ios-4.13.0.7
brd-jwheeler Sep 15, 2021
0818ded
Merge branch 'jw/release/4.13.0.7' into 'release/4.13.0'
brd-jwheeler Sep 15, 2021
0b436eb
DROID-2084: Update native currency code checks for ltc and doge
Sep 15, 2021
abaf650
Merge branch 'amit/DROID-2084' into 'release/4.13.0'
Sep 15, 2021
c63959b
DROID-1991: Apply design Improvements to Support Pages.
Sep 16, 2021
06b996a
Merge branch 'amit/DROID-1991' into 'release/4.13.0'
Sep 16, 2021
b8b50f4
Merge branch 'release/4.12.1' into 'main'
DrewCarlson Sep 16, 2021
827d9d8
DROID-2086: Add Platform and version code headers to Hydra API
Sep 16, 2021
3e702c9
Merge branch 'amit/DROID-2086' into 'release/4.13.0'
Sep 16, 2021
942894b
build ios-4.13.0.8
brd-jwheeler Sep 17, 2021
1c06ca1
Merge branch 'jw/release/ios-4.13.0.8' into 'release/4.13.0'
brd-jwheeler Sep 17, 2021
69784e5
DROID-2090: Fix crash related to scanning QR codes
Sep 17, 2021
a86a5e1
Merge branch 'bugfix/DROID-2090' into 'release/4.13.0'
Sep 20, 2021
f2d3429
DROID-2010: Adds Doge Easter egg background image to wallet list item…
Sep 21, 2021
f2039c5
Merge branch 'amit/DROID-2010' into 'release/4.13.0'
Sep 21, 2021
25c9984
Changes package info for wallet kit needed for crashlytics
Sep 21, 2021
58dec87
Merge branch 'amit/fix_crashlytics_package_info' into 'release/4.13.0'
Sep 21, 2021
11f8e82
Upgrade to Kotlin 1.5.31
DrewCarlson Sep 22, 2021
8f8b5cb
Merge branch 'drew/release-4.13-kt-1.5.31' into 'release/4.13.0'
DrewCarlson Sep 22, 2021
8dfd238
build ios-4.13.0.9
brd-jwheeler Sep 22, 2021
a30a524
Merge branch 'jw/release/ios-4.13.0.9' into 'release/4.13.0'
brd-jwheeler Sep 22, 2021
9e03c69
Update Doge animation to use Shiba image asset. Add bark, woof!
Sep 22, 2021
caad6aa
Release-4.13.0.2
Sep 22, 2021
a99f95c
Merge branch 'amit/update_doge_animation' into 'release/4.13.0'
Sep 22, 2021
1c02686
DROID-2096: Run Download bundle task to ensure new currency available…
Sep 23, 2021
947408a
Merge branch 'bugfix/DROID-2096' into 'release/4.13.0'
Sep 23, 2021
4de559d
Enable support for Doge/ltc in TestNet with limited support.
Sep 23, 2021
5b3f4c8
Merge branch 'bugfix/DROID-2096' into 'release/4.13.0'
Sep 23, 2021
75ddde6
DROID-2097: Display native currencies first in add Wallets list for H…
Sep 23, 2021
be5e86c
Release-4.13.0.3
Sep 23, 2021
94d5c15
Merge branch 'bugfix/DROID-2097' into 'release/4.13.0'
Sep 23, 2021
d4ff408
Merge branch 'main' into 'release/4.13.0'
DrewCarlson Sep 24, 2021
65f1732
Bump to v4.13.0.4
Sep 24, 2021
5803245
Run Android build on version change
DrewCarlson Sep 24, 2021
180b495
Merge branch 'amit/cherrypick-DROID-2083' into 'release/4.13.0'
DrewCarlson Sep 24, 2021
2bdc385
Merge branch 'release/4.13.0' into 'main'
DrewCarlson Sep 27, 2021
7987db2
Merge iOS/Android release-4.14
Nov 17, 2021
786e281
Merge branch 'release/4.14' into 'main'
Nov 17, 2021
15407ae
Renames conflicting resource id's for exchange dialog
Nov 18, 2021
46b1bed
Merge branch 'amit/fix_resource_id_conflcit' into 'release/4.14'
Nov 18, 2021
d2d109c
Guard against potential crash in BrowserController when accessing cur…
Nov 19, 2021
02d1f60
Bump to v4.14.0.13
Nov 19, 2021
ea28865
Merge branch 'amit/patch_partner_browser' into 'release/4.14'
Nov 22, 2021
e1b83d0
Update Firebase Config
Jan 4, 2022
6a3fc40
Bump to v4.14.0.14
Jan 4, 2022
48266b7
Merge branch 'amit/4.14-patch' into 'release/4.14'
Jan 4, 2022
76d730c
resolve conflcits
Apr 26, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[*.{kt,kts}]
indent_size=4
disabled_rules=no-wildcard-imports
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,5 @@ DerivedData/
cosmos-bundled/build-frameworks/
!cosmos-bundled/build-frameworks/Cosmos.xcframework/Info.plist
!cosmos-bundled/build-frameworks/Cosmos.xcframework/ios-arm64/Cosmos.framework/Info.plist
!cosmos-bundled/build-frameworks/Cosmos.xcframework/ios-arm64-simulator/Cosmos.framework/Info.plist
!cosmos-bundled/build-frameworks/Cosmos.xcframework/ios-x86_64-simulator/Cosmos.framework/Info.plist
44 changes: 24 additions & 20 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ stages:
# - template: Managed-Cluster-Applications.gitlab-ci.yml

default:
# image: alvrme/alpine-android:android-29-jdk11
# image: alvrme/alpine-android:android-29-jdk11
tags:
- macos
before_script:
Expand Down Expand Up @@ -48,6 +48,25 @@ build-cosmos:
paths:
- ./**/build/reports/tests

build-ios:
stage: build
only:
refs:
- main
- develop
- merge_requests
changes:
- buildSrc/**/Libs.kt
- brd-ios/**/*
- cosmos-*/**/*
- .gitlab-ci.yml
script:
- ./gradlew :cosmos-bundled:createXCFramework
- xcodebuild clean -workspace brd-ios/breadwallet.xcworkspace -scheme breadwallet | xcpretty
# - xcodebuild test -workspace brd-ios/breadwallet.xcworkspace -scheme breadwallet -destination 'platform=iOS Simulator,name=iPhone 13 mini,OS=15.0' | xcpretty -s
tags:
- macos

build-android:
stage: build
script:
Expand All @@ -59,37 +78,21 @@ build-android:
- merge_requests
changes:
- buildSrc/**/Libs.kt
- buildSrc/**/BrdRelease.kt
- brd-android/**/*
- cosmos-*/**/*
- .gitlab-ci.yml
artifacts:
when: always
paths:
- brd-android/app/build/outputs/apk/brd/debug/
- brd-android/app/build/outputs/apk/brd/release/
- brd-android/app/build/outputs/apk/brdTestnet/debug/
- brd-android/app/build/outputs/apk/brdTestnet/release/
- ./**/build/reports/**/*
reports:
junit: ./brd-android/**/build/test-results/**/TEST-*.xml

build-ios:
stage: build
only:
refs:
- main
- develop
- merge_requests
changes:
- buildSrc/**/Libs.kt
- brd-ios/**/*
- cosmos-*/**/*
- .gitlab-ci.yml
script:
- ./gradlew :cosmos-bundled:createXCFramework
- xcodebuild clean -workspace brd-ios/breadwallet.xcworkspace -scheme breadwallet | xcpretty
- xcodebuild test -workspace brd-ios/breadwallet.xcworkspace -scheme breadwallet -destination 'platform=iOS Simulator,name=iPhone 12,OS=14.5' | xcpretty -s
tags:
- macos

deploy-appetize:
stage: deploy
needs: [ "build-android" ]
Expand Down Expand Up @@ -142,6 +145,7 @@ deploy-firebase:
- ./gradlew :brd-android:app:uploadCrashlyticsSymbolFileBrdDebug
- ./gradlew :brd-android:app:appDistributionUploadBrdTestnetDebug
- ./gradlew :brd-android:app:uploadCrashlyticsSymbolFileBrdTestnetDebug
- ./gradlew postToSlack
rules:
- if: '$CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /^android/'
artifacts:
Expand Down
17 changes: 11 additions & 6 deletions brd-android/app-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ project.tasks.register<brd.DownloadBundles>("downloadBundles")
project.tasks.register<brd.DownloadSupportArticles>("downloadSupportArticles")

android {
compileSdkVersion(BrdRelease.ANDROID_COMPILE_SDK)
buildToolsVersion(BrdRelease.ANDROID_BUILD_TOOLS)
compileSdk = BrdRelease.ANDROID_COMPILE_SDK
buildToolsVersion = (BrdRelease.ANDROID_BUILD_TOOLS)
defaultConfig {
minSdkVersion(BrdRelease.ANDROID_MINIMUM_SDK)
minSdk = BrdRelease.ANDROID_MINIMUM_SDK
buildConfigField("int", "VERSION_CODE", "${BrdRelease.versionCode}")
}
lintOptions {
lint {
isAbortOnError = false
}

Expand All @@ -43,7 +43,12 @@ dependencies {
implementation(Libs.Coroutines.Core) {
version { strictly(brd.COROUTINES_VERSION) }
}
api(Libs.WalletKit.CoreAndroid)
val overrideIdeCheck = gradle.startParameter.taskNames.any { it.contains("brd-android") }
if (System.getProperty("idea.active") == "true" && !overrideIdeCheck) {
implementation(Libs.WalletKit.CoreJRE)
} else {
implementation(Libs.WalletKit.CoreAndroid)
}

implementation(Libs.Androidx.LifecycleExtensions)
implementation(Libs.Androidx.AppCompat)
Expand All @@ -60,7 +65,7 @@ dependencies {
implementation(Libs.Firebase.Crashlytics)

// Kodein DI
implementation(Libs.Kodein.CoreErasedJvm)
implementation(Libs.Kodein.Core)
implementation(Libs.Kodein.FrameworkAndroidX)

implementation(Libs.Jbsdiff.Core)
Expand Down
Binary file modified brd-android/app-core/src/debug/res/raw/brd_tokens_staging.tar
Binary file not shown.
Binary file modified brd-android/app-core/src/debug/res/raw/brd_web_3_staging.tar
Binary file not shown.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ package com.breadwallet.app

import com.breadwallet.breadbox.hashString
import com.breadwallet.breadbox.toBigDecimal
import com.breadwallet.crypto.Transfer
import com.breadwallet.crypto.TransferState
import com.blockset.walletkit.Transfer
import com.blockset.walletkit.TransferState
import java.util.Date

private const val PREFIX_DELIMITER = "-"
Expand Down Expand Up @@ -66,4 +66,4 @@ data class Trade(override val currencyCode: String, val hashString: String) : Co
return Trade(currencyCode, hashString)
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
*/
package com.breadwallet.breadbox

import com.breadwallet.crypto.Account
import com.breadwallet.crypto.Network
import com.blockset.walletkit.Account
import com.blockset.walletkit.Network

import com.breadwallet.crypto.Wallet
import com.breadwallet.crypto.System
import com.breadwallet.crypto.Transfer
import com.blockset.walletkit.Wallet
import com.blockset.walletkit.System
import com.blockset.walletkit.Transfer
import kotlinx.coroutines.flow.Flow

/** Provides access to data from a lazily created [System] using [Flow]s. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,21 @@

package com.breadwallet.breadbox

import com.breadwallet.crypto.Address
import com.breadwallet.crypto.Currency
import com.breadwallet.crypto.Network
import com.breadwallet.crypto.NetworkPeer
import com.breadwallet.crypto.Transfer
import com.breadwallet.crypto.TransferDirection
import com.breadwallet.crypto.Wallet
import com.breadwallet.crypto.WalletManager
import com.breadwallet.crypto.WalletManagerState
import com.blockset.walletkit.Address
import com.blockset.walletkit.Currency
import com.blockset.walletkit.Network
import com.blockset.walletkit.NetworkPeer
import com.blockset.walletkit.Transfer
import com.blockset.walletkit.TransferDirection
import com.blockset.walletkit.Wallet
import com.blockset.walletkit.WalletManager
import com.blockset.walletkit.WalletManagerState
import com.breadwallet.tools.util.BRConstants
import com.breadwallet.util.isBitcoin
import com.breadwallet.util.isBitcoinCash
import com.breadwallet.util.isDoge
import com.breadwallet.util.isEthereum
import com.breadwallet.util.isLitecoin
import com.breadwallet.util.isRipple
import com.google.common.primitives.UnsignedInteger
import kotlinx.coroutines.flow.Flow
Expand Down Expand Up @@ -148,6 +150,8 @@ val Wallet.urlScheme: String?
currency.code.isEthereum() || currency.isErc20() -> "ethereum"
currency.code.isRipple() -> "xrp"
currency.code.isBitcoin() -> "bitcoin"
currency.code.isDoge() -> "dogecoin"
currency.code.isLitecoin() -> "litecoin"
currency.code.isBitcoinCash() -> when {
walletManager.network.isMainnet -> "bitcoincash"
else -> "bchtest"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
*/
package com.breadwallet.breadbox

import com.breadwallet.crypto.*
import com.breadwallet.crypto.Unit
import com.breadwallet.crypto.errors.AccountInitializationError
import com.breadwallet.crypto.errors.ExportablePaperWalletError
import com.breadwallet.crypto.errors.FeeEstimationError
import com.breadwallet.crypto.errors.LimitEstimationError
import com.breadwallet.crypto.errors.WalletSweeperError
import com.blockset.walletkit.*
import com.blockset.walletkit.Unit
import com.blockset.walletkit.errors.AccountInitializationError
import com.blockset.walletkit.errors.ExportablePaperWalletError
import com.blockset.walletkit.errors.FeeEstimationError
import com.blockset.walletkit.errors.LimitEstimationError
import com.blockset.walletkit.errors.WalletSweeperError
import com.breadwallet.util.asyncApiCall
import java.math.BigDecimal
import java.math.RoundingMode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -307,12 +307,9 @@ private void press(int duration) {

ValueAnimator shadowAnim = ValueAnimator.ofFloat(SHADOW_UNPRESSED, SHADOW_PRESSED);
shadowAnim.setDuration(duration);
shadowAnim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
shadowOffSet = (float) animation.getAnimatedValue();
invalidate();
}
shadowAnim.addUpdateListener(animation -> {
shadowOffSet = (float) animation.getAnimatedValue();
invalidate();
});
shadowAnim.addListener(new ClearAnimationListener());

Expand All @@ -336,12 +333,9 @@ private void unPress(int duration) {

ValueAnimator shadowAnim = ValueAnimator.ofFloat(SHADOW_PRESSED, SHADOW_UNPRESSED);
shadowAnim.setDuration(duration);
shadowAnim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
shadowOffSet = (float) animation.getAnimatedValue();
invalidate();
}
shadowAnim.addUpdateListener(animation -> {
shadowOffSet = (float) animation.getAnimatedValue();
invalidate();
});
shadowAnim.addListener(new ClearAnimationListener());

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ data class CurrencyEntity(

companion object {
const val serialVersionUID = 7526472295622776147L
val TAG = CurrencyEntity::class.java.name
val TAG: String = CurrencyEntity::class.java.name
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@ package com.breadwallet.model

import com.breadwallet.util.isBitcoin
import com.breadwallet.util.isBitcoinCash
import com.breadwallet.util.isDoge
import com.breadwallet.util.isEthereum
import com.breadwallet.util.isLitecoin
import com.breadwallet.util.isRipple

data class TokenItem(
val address: String?,
val symbol: String,
val name: String,
var image: String?,
var backgroundImage: String?,
val isSupported: Boolean,
val currencyId: String,
val type: String = "",
Expand All @@ -26,12 +29,14 @@ data class TokenItem(
val coingeckoId: String? = null
) {

val isNative: Boolean = type.isBlank()
val isNative: Boolean = type.isBlank() || type == "native"

fun urlScheme(testnet: Boolean): String? = when {
private fun urlScheme(testnet: Boolean): String? = when {
symbol.isEthereum() || type == "erc20" -> "ethereum"
symbol.isRipple() -> "xrp"
symbol.isBitcoin() -> "bitcoin"
symbol.isDoge() -> "dogecoin"
symbol.isLitecoin() -> "litecoin"
symbol.isBitcoinCash() -> when {
testnet -> "bchtest"
else -> "bitcoincash"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.breadwallet.platform.entities

import com.breadwallet.crypto.WalletManagerMode
import com.blockset.walletkit.WalletManagerMode
import com.breadwallet.logger.logError
import com.platform.util.getIntOrDefault
import com.platform.util.getLongOrDefault
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import com.breadwallet.protocols.messageexchange.entities.PairingMetaData
import kotlinx.coroutines.flow.Flow
import com.breadwallet.platform.entities.TxMetaData
import com.breadwallet.platform.entities.WalletInfoData
import com.breadwallet.crypto.Account
import com.breadwallet.crypto.Transfer
import com.breadwallet.crypto.WalletManagerMode
import com.blockset.walletkit.Account
import com.blockset.walletkit.Transfer
import com.blockset.walletkit.WalletManagerMode
import com.breadwallet.platform.entities.TxMetaDataValue
import java.util.Date

Expand Down
Loading