From 7f1ca22c3accbdbf5cd4cd7127657abb5f0a73e1 Mon Sep 17 00:00:00 2001 From: Andrei Ashikhmin Date: Tue, 10 Oct 2023 20:24:24 +0700 Subject: [PATCH] feat(coinjoin): add wallet mixing entry point (#1216) * feat: coinjoin menu item * feat: coinjoin info fragment * fix: icons * fix: back button --- wallet/AndroidManifest.xml | 5 + wallet/res/drawable/ic_battery.xml | 5 + wallet/res/drawable/ic_coinjoin.xml | 5 + wallet/res/drawable/ic_coinjoin_big.xml | 6 + wallet/res/drawable/ic_lock_dash.xml | 9 ++ wallet/res/drawable/ic_shuffle.xml | 5 + wallet/res/layout/activity_coinjoin.xml | 32 ++++ wallet/res/layout/activity_settings.xml | 39 +++++ wallet/res/layout/fragment_coinjoin_info.xml | 150 ++++++++++++++++++ wallet/res/navigation/nav_coinjoin.xml | 37 +++++ wallet/res/values/strings.xml | 8 + .../schildbach/wallet/ui/SettingsActivity.kt | 4 + .../wallet/ui/coinjoin/CoinJoinActivity.kt | 35 ++++ .../ui/coinjoin/CoinJoinInfoFragment.kt | 42 +++++ .../username/CreateUsernamePrivacyFragment.kt | 2 - 15 files changed, 382 insertions(+), 2 deletions(-) create mode 100644 wallet/res/drawable/ic_battery.xml create mode 100644 wallet/res/drawable/ic_coinjoin.xml create mode 100644 wallet/res/drawable/ic_coinjoin_big.xml create mode 100644 wallet/res/drawable/ic_lock_dash.xml create mode 100644 wallet/res/drawable/ic_shuffle.xml create mode 100644 wallet/res/layout/activity_coinjoin.xml create mode 100644 wallet/res/layout/fragment_coinjoin_info.xml create mode 100644 wallet/res/navigation/nav_coinjoin.xml create mode 100644 wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinActivity.kt create mode 100644 wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinInfoFragment.kt diff --git a/wallet/AndroidManifest.xml b/wallet/AndroidManifest.xml index 6bfbd8fef1..b28639f407 100644 --- a/wallet/AndroidManifest.xml +++ b/wallet/AndroidManifest.xml @@ -365,6 +365,11 @@ android:theme="@style/My.Theme.ChildActivity" android:screenOrientation="portrait" /> + + + + diff --git a/wallet/res/drawable/ic_coinjoin.xml b/wallet/res/drawable/ic_coinjoin.xml new file mode 100644 index 0000000000..7f0e300b6e --- /dev/null +++ b/wallet/res/drawable/ic_coinjoin.xml @@ -0,0 +1,5 @@ + + + diff --git a/wallet/res/drawable/ic_coinjoin_big.xml b/wallet/res/drawable/ic_coinjoin_big.xml new file mode 100644 index 0000000000..636cdafca8 --- /dev/null +++ b/wallet/res/drawable/ic_coinjoin_big.xml @@ -0,0 +1,6 @@ + + + + diff --git a/wallet/res/drawable/ic_lock_dash.xml b/wallet/res/drawable/ic_lock_dash.xml new file mode 100644 index 0000000000..1051fd56f8 --- /dev/null +++ b/wallet/res/drawable/ic_lock_dash.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/wallet/res/drawable/ic_shuffle.xml b/wallet/res/drawable/ic_shuffle.xml new file mode 100644 index 0000000000..7619a5dfac --- /dev/null +++ b/wallet/res/drawable/ic_shuffle.xml @@ -0,0 +1,5 @@ + + + diff --git a/wallet/res/layout/activity_coinjoin.xml b/wallet/res/layout/activity_coinjoin.xml new file mode 100644 index 0000000000..2a498e7a81 --- /dev/null +++ b/wallet/res/layout/activity_coinjoin.xml @@ -0,0 +1,32 @@ + + + + + diff --git a/wallet/res/layout/activity_settings.xml b/wallet/res/layout/activity_settings.xml index 6241ebbf08..264835647a 100644 --- a/wallet/res/layout/activity_settings.xml +++ b/wallet/res/layout/activity_settings.xml @@ -103,6 +103,45 @@ app:srcCompat="@drawable/ic_menu_row_arrow" /> + + + + + + + + + diff --git a/wallet/res/layout/fragment_coinjoin_info.xml b/wallet/res/layout/fragment_coinjoin_info.xml new file mode 100644 index 0000000000..fd92d70ad7 --- /dev/null +++ b/wallet/res/layout/fragment_coinjoin_info.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +