From 9401b3e8f0d6f49751a4d203502cfb76842599c0 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Wed, 1 Apr 2020 15:11:55 -0300 Subject: [wallet] automatic code cleanup --- .../main/res/drawable/history_payment_aborted.xml | 12 +- wallet/src/main/res/drawable/history_refresh.xml | 16 +- wallet/src/main/res/drawable/history_refund.xml | 12 +- .../src/main/res/drawable/history_tip_accepted.xml | 12 +- .../src/main/res/drawable/history_tip_declined.xml | 12 +- wallet/src/main/res/drawable/history_withdrawn.xml | 12 +- .../src/main/res/drawable/ic_account_balance.xml | 12 +- .../res/drawable/ic_account_balance_wallet.xml | 12 +- wallet/src/main/res/drawable/ic_add_circle.xml | 12 +- wallet/src/main/res/drawable/ic_cancel.xml | 10 +- .../src/main/res/drawable/ic_cash_usd_outline.xml | 12 +- wallet/src/main/res/drawable/ic_check_circle.xml | 14 +- wallet/src/main/res/drawable/ic_directions.xml | 10 +- wallet/src/main/res/drawable/ic_error.xml | 10 +- .../main/res/drawable/ic_history_black_24dp.xml | 10 +- .../main/res/drawable/ic_launcher_foreground.xml | 82 +++---- wallet/src/main/res/drawable/ic_scan_qr.xml | 14 +- wallet/src/main/res/drawable/ic_settings.xml | 12 +- wallet/src/main/res/drawable/ic_sync.xml | 12 +- wallet/src/main/res/drawable/pending_border.xml | 18 +- wallet/src/main/res/drawable/side_nav_bar.xml | 10 +- .../main/res/layout-w550dp/payment_bottom_bar.xml | 176 +++++++------- wallet/src/main/res/layout/activity_main.xml | 34 +-- wallet/src/main/res/layout/app_bar_main.xml | 84 +++---- .../src/main/res/layout/fragment_already_paid.xml | 48 ++-- wallet/src/main/res/layout/fragment_error.xml | 136 +++++------ wallet/src/main/res/layout/fragment_json.xml | 41 ++-- .../res/layout/fragment_payment_successful.xml | 76 +++---- .../res/layout/fragment_pending_operations.xml | 26 +-- .../src/main/res/layout/fragment_product_image.xml | 10 +- .../main/res/layout/fragment_prompt_payment.xml | 42 ++-- .../main/res/layout/fragment_prompt_withdraw.xml | 252 ++++++++++----------- .../res/layout/fragment_review_exchange_tos.xml | 128 +++++------ wallet/src/main/res/layout/fragment_settings.xml | 106 ++++----- .../src/main/res/layout/fragment_show_balance.xml | 126 +++++------ .../src/main/res/layout/fragment_show_history.xml | 45 ++-- .../res/layout/fragment_withdraw_successful.xml | 76 +++---- wallet/src/main/res/layout/history_payment.xml | 116 +++++----- wallet/src/main/res/layout/history_receive.xml | 144 ++++++------ wallet/src/main/res/layout/history_row.xml | 92 ++++---- wallet/src/main/res/layout/list_item_balance.xml | 100 ++++---- wallet/src/main/res/layout/list_item_product.xml | 96 ++++---- .../main/res/layout/list_item_product_single.xml | 102 ++++----- wallet/src/main/res/layout/payment_bottom_bar.xml | 176 +++++++------- wallet/src/main/res/layout/payment_details.xml | 168 +++++++------- wallet/src/main/res/layout/pending_row.xml | 47 ++-- wallet/src/main/res/menu/activity_main_drawer.xml | 30 +-- wallet/src/main/res/menu/balance.xml | 16 +- wallet/src/main/res/menu/history.xml | 23 +- wallet/src/main/res/menu/pending_operations.xml | 10 +- .../src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 7 +- .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 7 +- wallet/src/main/res/navigation/nav_graph.xml | 150 ++++++------ wallet/src/main/res/values/colors.xml | 3 +- .../src/main/res/values/ic_launcher_background.xml | 3 +- wallet/src/main/res/xml/apduservice.xml | 14 +- wallet/src/main/res/xml/backup_descriptor.xml | 3 +- 57 files changed, 1512 insertions(+), 1527 deletions(-) (limited to 'wallet/src/main/res') diff --git a/wallet/src/main/res/drawable/history_payment_aborted.xml b/wallet/src/main/res/drawable/history_payment_aborted.xml index 03cd7b2..8d47c26 100644 --- a/wallet/src/main/res/drawable/history_payment_aborted.xml +++ b/wallet/src/main/res/drawable/history_payment_aborted.xml @@ -15,11 +15,11 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000" + android:pathData="M15.46 18.12L16.88 19.54L19 17.41L21.12 19.54L22.54 18.12L20.41 16L22.54 13.88L21.12 12.46L19 14.59L16.88 12.46L15.46 13.88L17.59 16M14.97 11.62C14.86 10.28 13.58 8.97 12 9C10.3 9.04 9 10.3 9 12C9 13.7 10.3 14.94 12 15C12.39 15 12.77 14.92 13.14 14.77C13.41 13.67 13.86 12.63 14.97 11.62M13 16H7C7 14.9 6.1 14 5 14V10C6.1 10 7 9.1 7 8H17C17 9.1 17.9 10 19 10V10.05C19.67 10.06 20.34 10.18 21 10.4V6H3V18H13.32C13.1 17.33 13 16.66 13 16Z" /> diff --git a/wallet/src/main/res/drawable/history_refresh.xml b/wallet/src/main/res/drawable/history_refresh.xml index f5d8972..219b891 100644 --- a/wallet/src/main/res/drawable/history_refresh.xml +++ b/wallet/src/main/res/drawable/history_refresh.xml @@ -15,14 +15,14 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#FF000000" + android:pathData="M14.97,11.62C14.86,10.28 13.58,8.97 12,9c-1.7,0.04 -3,1.3 -3,3 0,1.7 1.3,2.94 3,3 0.39,0 0.77,-0.08 1.14,-0.23 0.27,-1.1 0.72,-2.14 1.83,-3.15M13,16H7C7,14.9 6.1,14 5,14V10C6.1,10 7,9.1 7,8h10c0,1.1 0.9,2 2,2v0.05c0.67,0.01 1.34,0.13 2,0.35V6H3V18H13.32C13.1,17.33 13,16.66 13,16Z" /> + android:fillColor="#FF000000" + android:pathData="M19,12 L16.75,14.25 19,16.5V15c1.38,0 2.5,1.12 2.5,2.5 0,0.4 -0.09,0.78 -0.26,1.12l1.09,1.09C22.75,19.08 23,18.32 23,17.5c0,-2.21 -1.79,-4 -4,-4V12m-3.33,3.29C15.25,15.92 15,16.68 15,17.5c0,2.21 1.79,4 4,4V23L21.25,20.75 19,18.5V20c-1.38,0 -2.5,-1.12 -2.5,-2.5 0,-0.4 0.09,-0.78 0.26,-1.12z" /> diff --git a/wallet/src/main/res/drawable/history_refund.xml b/wallet/src/main/res/drawable/history_refund.xml index 60872a9..6c3d0a7 100644 --- a/wallet/src/main/res/drawable/history_refund.xml +++ b/wallet/src/main/res/drawable/history_refund.xml @@ -15,11 +15,11 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000" + android:pathData="M3,11H21V23H3V11M12,15A2,2 0 0,1 14,17A2,2 0 0,1 12,19A2,2 0 0,1 10,17A2,2 0 0,1 12,15M7,13A2,2 0 0,1 5,15V19A2,2 0 0,1 7,21H17A2,2 0 0,1 19,19V15A2,2 0 0,1 17,13H7M17,5V10H15.5V6.5H9.88L12.3,8.93L11.24,10L7,5.75L11.24,1.5L12.3,2.57L9.88,5H17Z" /> diff --git a/wallet/src/main/res/drawable/history_tip_accepted.xml b/wallet/src/main/res/drawable/history_tip_accepted.xml index 794d1bf..b945b53 100644 --- a/wallet/src/main/res/drawable/history_tip_accepted.xml +++ b/wallet/src/main/res/drawable/history_tip_accepted.xml @@ -15,11 +15,11 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000" + android:pathData="M18,21L15,18L18,15V17H22V19H18V21M10,4A4,4 0 0,1 14,8A4,4 0 0,1 10,12A4,4 0 0,1 6,8A4,4 0 0,1 10,4M10,14C11.15,14 12.25,14.12 13.24,14.34C12.46,15.35 12,16.62 12,18C12,18.7 12.12,19.37 12.34,20H2V18C2,15.79 5.58,14 10,14Z" /> diff --git a/wallet/src/main/res/drawable/history_tip_declined.xml b/wallet/src/main/res/drawable/history_tip_declined.xml index 4838ee4..4bd1633 100644 --- a/wallet/src/main/res/drawable/history_tip_declined.xml +++ b/wallet/src/main/res/drawable/history_tip_declined.xml @@ -15,11 +15,11 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000" + android:pathData="M10 4A4 4 0 0 0 6 8A4 4 0 0 0 10 12A4 4 0 0 0 14 8A4 4 0 0 0 10 4M17.5 13C15 13 13 15 13 17.5C13 20 15 22 17.5 22C20 22 22 20 22 17.5C22 15 20 13 17.5 13M10 14C5.58 14 2 15.79 2 18V20H11.5A6.5 6.5 0 0 1 11 17.5A6.5 6.5 0 0 1 11.95 14.14C11.32 14.06 10.68 14 10 14M17.5 14.5C19.16 14.5 20.5 15.84 20.5 17.5C20.5 18.06 20.35 18.58 20.08 19L16 14.92C16.42 14.65 16.94 14.5 17.5 14.5M14.92 16L19 20.08C18.58 20.35 18.06 20.5 17.5 20.5C15.84 20.5 14.5 19.16 14.5 17.5C14.5 16.94 14.65 16.42 14.92 16Z" /> diff --git a/wallet/src/main/res/drawable/history_withdrawn.xml b/wallet/src/main/res/drawable/history_withdrawn.xml index f524474..4fd64f5 100644 --- a/wallet/src/main/res/drawable/history_withdrawn.xml +++ b/wallet/src/main/res/drawable/history_withdrawn.xml @@ -15,11 +15,11 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000" + android:pathData="M3 0V3H0V5H3V8H5V5H8V3H5V0H3M9 3V6H6V9H3V19C3 20.1 3.89 21 5 21H19C20.11 21 21 20.11 21 19V18H12C10.9 18 10 17.11 10 16V8C10 6.9 10.89 6 12 6H21V5C21 3.9 20.11 3 19 3H9M12 8V16H22V8H12M16 10.5C16.83 10.5 17.5 11.17 17.5 12C17.5 12.83 16.83 13.5 16 13.5C15.17 13.5 14.5 12.83 14.5 12C14.5 11.17 15.17 10.5 16 10.5Z" /> diff --git a/wallet/src/main/res/drawable/ic_account_balance.xml b/wallet/src/main/res/drawable/ic_account_balance.xml index e9f51a2..3f10d02 100644 --- a/wallet/src/main/res/drawable/ic_account_balance.xml +++ b/wallet/src/main/res/drawable/ic_account_balance.xml @@ -15,11 +15,11 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="#FF000000" + android:pathData="M4,10v7h3v-7L4,10zM10,10v7h3v-7h-3zM2,22h19v-3L2,19v3zM16,10v7h3v-7h-3zM11.5,1L2,6v2h19L21,6l-9.5,-5z" /> diff --git a/wallet/src/main/res/drawable/ic_account_balance_wallet.xml b/wallet/src/main/res/drawable/ic_account_balance_wallet.xml index 514b118..912d0a8 100644 --- a/wallet/src/main/res/drawable/ic_account_balance_wallet.xml +++ b/wallet/src/main/res/drawable/ic_account_balance_wallet.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="#FF000000" + android:pathData="M21,18v1c0,1.1 -0.9,2 -2,2L5,21c-1.11,0 -2,-0.9 -2,-2L3,5c0,-1.1 0.89,-2 2,-2h14c1.1,0 2,0.9 2,2v1h-9c-1.11,0 -2,0.9 -2,2v8c0,1.1 0.89,2 2,2h9zM12,16h10L22,8L12,8v8zM16,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z" /> diff --git a/wallet/src/main/res/drawable/ic_add_circle.xml b/wallet/src/main/res/drawable/ic_add_circle.xml index c32faa6..655a314 100644 --- a/wallet/src/main/res/drawable/ic_add_circle.xml +++ b/wallet/src/main/res/drawable/ic_add_circle.xml @@ -15,11 +15,11 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="#FF000000" + android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z" /> diff --git a/wallet/src/main/res/drawable/ic_cancel.xml b/wallet/src/main/res/drawable/ic_cancel.xml index 6dc55cf..13c783f 100644 --- a/wallet/src/main/res/drawable/ic_cancel.xml +++ b/wallet/src/main/res/drawable/ic_cancel.xml @@ -15,11 +15,11 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z" /> diff --git a/wallet/src/main/res/drawable/ic_cash_usd_outline.xml b/wallet/src/main/res/drawable/ic_cash_usd_outline.xml index 428a466..0e26eef 100644 --- a/wallet/src/main/res/drawable/ic_cash_usd_outline.xml +++ b/wallet/src/main/res/drawable/ic_cash_usd_outline.xml @@ -15,11 +15,11 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000" + android:pathData="M20,18H4V6H20M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4M11,17H13V16H14A1,1 0 0,0 15,15V12A1,1 0 0,0 14,11H11V10H15V8H13V7H11V8H10A1,1 0 0,0 9,9V12A1,1 0 0,0 10,13H13V14H9V16H11V17Z" /> diff --git a/wallet/src/main/res/drawable/ic_check_circle.xml b/wallet/src/main/res/drawable/ic_check_circle.xml index c299cc3..375b366 100644 --- a/wallet/src/main/res/drawable/ic_check_circle.xml +++ b/wallet/src/main/res/drawable/ic_check_circle.xml @@ -15,12 +15,12 @@ --> + android:width="24dp" + android:height="24dp" + android:alpha="0.56" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/green" + android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z" /> diff --git a/wallet/src/main/res/drawable/ic_directions.xml b/wallet/src/main/res/drawable/ic_directions.xml index 7fc7fe7..229d69c 100644 --- a/wallet/src/main/res/drawable/ic_directions.xml +++ b/wallet/src/main/res/drawable/ic_directions.xml @@ -15,11 +15,11 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M21.71,11.29l-9,-9c-0.39,-0.39 -1.02,-0.39 -1.41,0l-9,9c-0.39,0.39 -0.39,1.02 0,1.41l9,9c0.39,0.39 1.02,0.39 1.41,0l9,-9c0.39,-0.38 0.39,-1.01 0,-1.41zM14,14.5V12h-4v3H8v-4c0,-0.55 0.45,-1 1,-1h5V7.5l3.5,3.5 -3.5,3.5z" /> diff --git a/wallet/src/main/res/drawable/ic_error.xml b/wallet/src/main/res/drawable/ic_error.xml index 1f705af..abbe33e 100644 --- a/wallet/src/main/res/drawable/ic_error.xml +++ b/wallet/src/main/res/drawable/ic_error.xml @@ -15,11 +15,11 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" /> diff --git a/wallet/src/main/res/drawable/ic_history_black_24dp.xml b/wallet/src/main/res/drawable/ic_history_black_24dp.xml index 4404ee4..5836444 100644 --- a/wallet/src/main/res/drawable/ic_history_black_24dp.xml +++ b/wallet/src/main/res/drawable/ic_history_black_24dp.xml @@ -15,11 +15,11 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" /> diff --git a/wallet/src/main/res/drawable/ic_launcher_foreground.xml b/wallet/src/main/res/drawable/ic_launcher_foreground.xml index 028c873..0e103bc 100644 --- a/wallet/src/main/res/drawable/ic_launcher_foreground.xml +++ b/wallet/src/main/res/drawable/ic_launcher_foreground.xml @@ -15,54 +15,54 @@ --> + android:width="108dp" + android:height="108dp" + android:viewportWidth="237.28813" + android:viewportHeight="237.2881"> + android:translateX="48.64407" + android:translateY="48.644062"> + android:fillAlpha="1" + android:fillColor="#ffffff" + android:pathData="m31.669,82.748h-4.702v-19.684h-6.041v-4.112h16.783v4.112L31.669,63.064Z" + android:strokeWidth="0.81604069" + android:strokeColor="#00000000" /> + android:fillAlpha="1" + android:fillColor="#ffffff" + android:pathData="m50.301,74.364q-2.614,0 -3.65,0.669 -1.036,0.669 -1.036,2.295 0,1.211 0.717,1.929 0.717,0.717 1.944,0.717 1.849,0 2.869,-1.387 1.02,-1.403 1.02,-3.905v-0.319zM56.804,72.563v10.185h-4.638v-1.992q-0.845,1.179 -2.168,1.817 -1.323,0.638 -2.917,0.638 -3.044,0 -4.75,-1.61 -1.689,-1.61 -1.689,-4.495 0,-3.124 2.024,-4.606 2.024,-1.498 6.264,-1.498h3.235v-0.781q0,-1.132 -0.829,-1.705 -0.813,-0.59 -2.407,-0.59 -1.674,0 -3.251,0.43 -1.562,0.414 -3.267,1.339v-3.985q1.546,-0.638 3.14,-0.94 1.594,-0.303 3.379,-0.303 4.351,0 6.104,1.769 1.769,1.769 1.769,6.328z" + android:strokeWidth="0.81604069" + android:strokeColor="#00000000" /> + android:fillAlpha="1" + android:fillColor="#ffffff" + android:pathData="m64.964,75.305v-13.771h-4.734v-3.586h9.404v17.357q0,2.104 0.653,2.98 0.653,0.877 2.215,0.877h3.73v3.586h-5.037q-3.331,0 -4.781,-1.721 -1.45,-1.721 -1.45,-5.722z" + android:strokeWidth="0.81604069" + android:strokeColor="#00000000" /> + android:fillAlpha="1" + android:fillColor="#ffffff" + android:pathData="m96.012,81.871q-1.626,0.669 -3.315,1.004 -1.689,0.335 -3.57,0.335 -4.479,0 -6.853,-2.391 -2.359,-2.407 -2.359,-6.917 0,-4.367 2.279,-6.901 2.279,-2.534 6.216,-2.534 3.969,0 6.152,2.359 2.199,2.343 2.199,6.614v1.897h-12.097q0.016,2.104 1.243,3.14 1.227,1.036 3.666,1.036 1.61,0 3.172,-0.462 1.562,-0.462 3.267,-1.466zM92.059,71.83q-0.032,-1.849 -0.956,-2.789 -0.908,-0.956 -2.694,-0.956 -1.61,0 -2.566,0.988 -0.956,0.972 -1.132,2.773z" + android:strokeWidth="0.81604069" + android:strokeColor="#00000000" /> + android:fillAlpha="1" + android:fillColor="#ffffff" + android:pathData="m116.445,69.822q-0.765,-0.701 -1.801,-1.052 -1.02,-0.351 -2.247,-0.351 -1.482,0 -2.598,0.526 -1.1,0.51 -1.705,1.498 -0.383,0.606 -0.542,1.466 -0.143,0.861 -0.143,2.614v8.224h-4.67v-17.851h4.67v2.773q0.685,-1.53 2.104,-2.359 1.419,-0.845 3.315,-0.845 0.956,0 1.865,0.239 0.924,0.223 1.753,0.669z" + android:strokeWidth="0.81604069" + android:strokeColor="#00000000" /> + android:fillAlpha="1" + android:fillColor="#ae1010" + android:pathData="M25.843,97.583L16.433,97.583L0,70.865 16.433,44.111l9.409,0l-16.522,26.754z" + android:strokeWidth="2.03518677" + android:strokeColor="#00000000" /> + android:fillAlpha="1" + android:fillColor="#ae1010" + android:pathData="m109.483,97.667 l17.087,-27.134 -17.041,-27.171l9.712,0l17.041,27.171 -17.041,27.134z" + android:strokeWidth="2.08855891" + android:strokeColor="#00000000" /> diff --git a/wallet/src/main/res/drawable/ic_scan_qr.xml b/wallet/src/main/res/drawable/ic_scan_qr.xml index 2ca8a69..2d718eb 100644 --- a/wallet/src/main/res/drawable/ic_scan_qr.xml +++ b/wallet/src/main/res/drawable/ic_scan_qr.xml @@ -1,10 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorOnPrimarySurface" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000" + android:pathData="M4,4H10V10H4V4M20,4V10H14V4H20M14,15H16V13H14V11H16V13H18V11H20V13H18V15H20V18H18V20H16V18H13V20H11V16H14V15M16,15V18H18V15H16M4,20V14H10V20H4M6,6V8H8V6H6M16,6V8H18V6H16M6,16V18H8V16H6M4,11H6V13H4V11M9,11H13V15H11V13H9V11M11,6H13V10H11V6M2,2V6H0V2A2,2 0 0,1 2,0H6V2H2M22,0A2,2 0 0,1 24,2V6H22V2H18V0H22M2,18V22H6V24H2A2,2 0 0,1 0,22V18H2M22,22V18H24V22A2,2 0 0,1 22,24H18V22H22Z" /> diff --git a/wallet/src/main/res/drawable/ic_settings.xml b/wallet/src/main/res/drawable/ic_settings.xml index 7cadd58..a671514 100644 --- a/wallet/src/main/res/drawable/ic_settings.xml +++ b/wallet/src/main/res/drawable/ic_settings.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#FF000000" + android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z" /> diff --git a/wallet/src/main/res/drawable/ic_sync.xml b/wallet/src/main/res/drawable/ic_sync.xml index 78593fc..8991613 100644 --- a/wallet/src/main/res/drawable/ic_sync.xml +++ b/wallet/src/main/res/drawable/ic_sync.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="#FF000000" + android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" /> diff --git a/wallet/src/main/res/drawable/pending_border.xml b/wallet/src/main/res/drawable/pending_border.xml index bb50fea..c858219 100644 --- a/wallet/src/main/res/drawable/pending_border.xml +++ b/wallet/src/main/res/drawable/pending_border.xml @@ -1,5 +1,4 @@ - - + android:shape="rectangle"> - - + - + android:width="1dp" + android:color="@color/colorPrimary"> - - + \ No newline at end of file diff --git a/wallet/src/main/res/drawable/side_nav_bar.xml b/wallet/src/main/res/drawable/side_nav_bar.xml index 6be80a8..ecc7e71 100644 --- a/wallet/src/main/res/drawable/side_nav_bar.xml +++ b/wallet/src/main/res/drawable/side_nav_bar.xml @@ -15,10 +15,10 @@ --> + android:shape="rectangle"> + android:angle="135" + android:endColor="@color/colorPrimaryDark" + android:startColor="@color/colorPrimary" + android:type="linear" /> \ No newline at end of file diff --git a/wallet/src/main/res/layout-w550dp/payment_bottom_bar.xml b/wallet/src/main/res/layout-w550dp/payment_bottom_bar.xml index d9e2f59..d9952f8 100644 --- a/wallet/src/main/res/layout-w550dp/payment_bottom_bar.xml +++ b/wallet/src/main/res/layout-w550dp/payment_bottom_bar.xml @@ -15,108 +15,108 @@ --> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/bottomView" + style="@style/BottomCard" + android:layout_width="0dp" + android:layout_height="wrap_content" + tools:showIn="@layout/fragment_prompt_payment"> + android:layout_width="match_parent" + android:layout_height="wrap_content"> + android:id="@+id/totalLabelView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:text="@string/payment_label_amount_total" + android:visibility="invisible" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/totalView" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toEndOf="@+id/abortButton" + app:layout_constraintTop_toTopOf="@+id/totalView" + app:layout_constraintVertical_bias="0.0" + tools:visibility="visible" /> + android:id="@+id/totalView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="16dp" + android:textColor="?android:attr/textColorPrimary" + android:textStyle="bold" + android:visibility="invisible" + app:layout_constraintBottom_toTopOf="@+id/feeView" + app:layout_constraintEnd_toStartOf="@+id/confirmButton" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toEndOf="@+id/totalLabelView" + app:layout_constraintTop_toTopOf="parent" + app:layout_goneMarginBottom="8dp" + tools:text="10 TESTKUDOS" + tools:visibility="visible" /> + android:id="@+id/feeView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginEnd="16dp" + android:layout_marginBottom="8dp" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/confirmButton" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/totalView" + tools:text="@string/payment_fee" + tools:visibility="visible" />