Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(wallet): replace network selector in profile

Browse Source
This commit is contained in:
Pavneet-Sing
2022-03-02 03:11:19 +05:30
parent f53a2f008f
commit 7848105d6f
9 changed files with 331 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/res/drawable/ic_arrow_down_circular_day_night.xml
+9
View File
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="200"
android:viewportHeight="200">
<path
android:fillColor="@color/brave_wallet_day_night_icon_color"
android:pathData="M100,15a85,85 0,1 0,85 85A84.93,84.93 0,0 0,100 15ZM100,165a65,65 0,1 1,65 -65A64.87,64.87 0,0 1,100 165ZM128.5,83.5 L100,111.5L71.5,83a9.9,9.9 0,0 0,-14 14L86,125.5a19.92,19.92 0,0 0,28.5 0L143,97a9.67,9.67 0,0 0,0 -14C138.5,79.5 132,79.5 128.5,83.5Z"/>
</vector>
android/java/res/layout/activity_network_selector.xml
+2 -1
View File
@@ -13,13 +13,14 @@
android:orientation="vertical"
tools:context=".browser.crypto_wallet.activities.NetworkSelectorActivity">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_marginBottom="8dp"
android:background="@color/wallet_toolbar_bg_color"
android:gravity="center_vertical"
app:titleCentered="true"
android:translationZ="10dp"/>
<androidx.recyclerview.widget.RecyclerView
android/java/res/layout/fragment_portfolio.xml
+257 -251
View File
@@ -1,4 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2022 The Brave Authors. All rights reserved.
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this file,
You can obtain one at http://mozilla.org/MPL/2.0/. -->
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@@ -7,266 +12,267 @@
android:background="@color/wallet_bg"
android:fillViewport="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:layout_marginBottom="8dp"
android:orientation="horizontal">
<TextView
android:id="@+id/balance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingTop="16dp"
android:layout_marginBottom="8dp"
android:text="@string/brave_wallet_portfolio_balance_updating"
android:textColor="@color/wallet_text_color"
android:textStyle="bold"
android:textSize="32sp" />
<Spinner
android:id="@+id/spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="12sp"
android:textColor="@color/wallet_text_color"
android:layout_gravity="center_vertical"
android:prompt="@string/mainnet"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:paddingTop="2dp"
android:paddingBottom="2dp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:layout_marginBottom="8dp"
android:orientation="horizontal">
<TextView
android:id="@+id/trend_percentage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:drawablePadding="4dp"
android:textSize="14sp"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/trend_timeframe"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp" />
</LinearLayout>
<org.chromium.chrome.browser.crypto_wallet.util.SmoothLineChartEquallySpaced
android:layout_marginTop="32dp"
android:layout_width="match_parent"
android:layout_height="200dp"
android:id="@+id/line_chart" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:orientation="horizontal">
<RadioGroup
tools:ignore="UselessParent"
android:id="@+id/portfolio_duration_radio_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:orientation="horizontal">
<RadioButton
android:id="@+id/live_radiobutton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/wallet_radio_button_selector"
android:gravity="center"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:textColor="@color/crypto_wallet_radiobutton_color_selector"
android:button="@null"
android:textSize="14sp"
android:textStyle="bold"
android:drawablePadding="4dp"
android:text="@string/live" />
<RadioButton
android:id="@+id/day_1_radiobutton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/wallet_radio_button_selector"
android:gravity="center"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:textColor="@color/crypto_wallet_radiobutton_color_selector"
android:button="@null"
android:textSize="14sp"
android:textStyle="bold"
android:checked="true"
android:text="@string/day_1" />
<RadioButton
android:id="@+id/week_1_radiobutton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/wallet_radio_button_selector"
android:gravity="center"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:textColor="@color/crypto_wallet_radiobutton_color_selector"
android:button="@null"
android:textSize="14sp"
android:textStyle="bold"
android:text="@string/week_1" />
<RadioButton
android:id="@+id/month_1_radiobutton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/wallet_radio_button_selector"
android:gravity="center"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:textColor="@color/crypto_wallet_radiobutton_color_selector"
android:button="@null"
android:textSize="14sp"
android:textStyle="bold"
android:text="@string/month_1" />
<RadioButton
android:id="@+id/month_3_radiobutton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/wallet_radio_button_selector"
android:gravity="center"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:textColor="@color/crypto_wallet_radiobutton_color_selector"
android:button="@null"
android:textSize="14sp"
android:textStyle="bold"
android:text="@string/month_3" />
<RadioButton
android:id="@+id/year_1_radiobutton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/wallet_radio_button_selector"
android:gravity="center"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:textColor="@color/crypto_wallet_radiobutton_color_selector"
android:button="@null"
android:textSize="14sp"
android:textStyle="bold"
android:text="@string/year_1" />
<RadioButton
android:id="@+id/all_radiobutton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/wallet_radio_button_selector"
android:gravity="center"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:textColor="@color/crypto_wallet_radiobutton_color_selector"
android:button="@null"
android:textSize="14sp"
android:textStyle="bold"
android:text="@string/all" />
</RadioGroup>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/wallet_edittext_outline_color"
android:layout_marginBottom="8dp"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvCoins"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="24dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:layout_marginBottom="16dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/edit_visible_assets"
android:layout_width="wrap_content"
android:id="@+id/balance"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/edit_visible_assets"
android:textColor="@color/wallet_text_color"
android:background="@drawable/rounded_white_holo_bg"
android:gravity="center"
android:textSize="14sp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_weight=".7"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:layout_marginStart="20dp"
android:layout_marginBottom="8dp"/>
android:gravity="center_vertical"
android:text="@string/brave_wallet_portfolio_balance_updating"
android:textColor="@color/wallet_text_color"
android:textStyle="bold"
android:textSize="32sp" />
<android.widget.Button
android:id="@+id/fragment_portfolio_btn_change_networks"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:layout_weight=".3"
android:background="@drawable/rounded_holo_button"
android:drawableEnd="@drawable/ic_arrow_down_circular_day_night"
android:minHeight="0dp"
android:paddingHorizontal="8dp"
android:paddingVertical="2dp"
android:textAllCaps="false"
android:textColor="@color/brave_wallet_day_night_text_color" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:layout_marginBottom="8dp"
android:orientation="horizontal">
<TextView
android:id="@+id/trend_percentage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:drawablePadding="4dp"
android:textSize="14sp"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/trend_timeframe"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp" />
</LinearLayout>
<org.chromium.chrome.browser.crypto_wallet.util.SmoothLineChartEquallySpaced
android:layout_marginTop="32dp"
android:layout_width="match_parent"
android:layout_height="200dp"
android:id="@+id/line_chart" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:orientation="horizontal">
<RadioGroup
tools:ignore="UselessParent"
android:id="@+id/portfolio_duration_radio_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:orientation="horizontal">
<RadioButton
android:id="@+id/live_radiobutton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/wallet_radio_button_selector"
android:gravity="center"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:textColor="@color/crypto_wallet_radiobutton_color_selector"
android:button="@null"
android:textSize="14sp"
android:textStyle="bold"
android:drawablePadding="4dp"
android:text="@string/live" />
<RadioButton
android:id="@+id/day_1_radiobutton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/wallet_radio_button_selector"
android:gravity="center"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:textColor="@color/crypto_wallet_radiobutton_color_selector"
android:button="@null"
android:textSize="14sp"
android:textStyle="bold"
android:checked="true"
android:text="@string/day_1" />
<RadioButton
android:id="@+id/week_1_radiobutton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/wallet_radio_button_selector"
android:gravity="center"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:textColor="@color/crypto_wallet_radiobutton_color_selector"
android:button="@null"
android:textSize="14sp"
android:textStyle="bold"
android:text="@string/week_1" />
<RadioButton
android:id="@+id/month_1_radiobutton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/wallet_radio_button_selector"
android:gravity="center"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:textColor="@color/crypto_wallet_radiobutton_color_selector"
android:button="@null"
android:textSize="14sp"
android:textStyle="bold"
android:text="@string/month_1" />
<RadioButton
android:id="@+id/month_3_radiobutton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/wallet_radio_button_selector"
android:gravity="center"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:textColor="@color/crypto_wallet_radiobutton_color_selector"
android:button="@null"
android:textSize="14sp"
android:textStyle="bold"
android:text="@string/month_3" />
<RadioButton
android:id="@+id/year_1_radiobutton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/wallet_radio_button_selector"
android:gravity="center"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:textColor="@color/crypto_wallet_radiobutton_color_selector"
android:button="@null"
android:textSize="14sp"
android:textStyle="bold"
android:text="@string/year_1" />
<RadioButton
android:id="@+id/all_radiobutton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/wallet_radio_button_selector"
android:gravity="center"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:textColor="@color/crypto_wallet_radiobutton_color_selector"
android:button="@null"
android:textSize="14sp"
android:textStyle="bold"
android:text="@string/all" />
</RadioGroup>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/wallet_edittext_outline_color"
android:layout_marginBottom="8dp"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvCoins"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="24dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/edit_visible_assets"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/edit_visible_assets"
android:textColor="@color/wallet_text_color"
android:background="@drawable/rounded_white_holo_bg"
android:gravity="center"
android:textSize="14sp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:layout_marginStart="20dp"
android:layout_marginBottom="8dp"/>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
android/java/res/values-night/brave_colors.xml
+4
View File
@@ -28,6 +28,10 @@
<color name="onboarding_progressbar_secondary_bg">#212529</color>
<!-- Day/Night colors -->
<color name="brave_wallet_day_night_text_color">@android:color/white</color>
<color name="brave_wallet_day_night_icon_color">@android:color/white</color>
<!-- Text colors -->
<color name="brave_theme_hint_text">#84889C</color>
android/java/res/values/brave_colors.xml
+4
View File
@@ -21,6 +21,10 @@
<color name="modern_blue_700">#C22700</color>
<color name="dialog_bg_color_dark">@color/toolbar_background_primary_dark</color>
<!-- Day/Night colors -->
<color name="brave_wallet_day_night_text_color">@android:color/black</color>
<color name="brave_wallet_day_night_icon_color">@android:color/black</color>
<!-- Text colors -->
<color name="brave_theme_hint_text">#868E96</color>