diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni index 6197f2e466c..a7e6f6f602e 100644 --- a/android/brave_java_resources.gni +++ b/android/brave_java_resources.gni @@ -10,6 +10,8 @@ brave_java_resources = [ "java/res/anim/slide_out_bottom.xml", "java/res/anim/slide_out_top.xml", "java/res/color/crypto_wallet_onboarding_button_text_color.xml", + "java/res/color/wallet_checkbox_background_color_selector.xml", + "java/res/color/wallet_checkbox_color_selector.xml", "java/res/color/wallet_onboarding_input_field_stroke_color.xml", "java/res/color/wallet_onboarding_network_item_stroke_selector.xml", "java/res/drawable-hdpi/brave_ads_launch_graphic.png", diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/OnboardingNetworkSelectorGridAdapter.java b/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/OnboardingNetworkSelectorGridAdapter.java index 713da158c5f..2a986903e9b 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/OnboardingNetworkSelectorGridAdapter.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/OnboardingNetworkSelectorGridAdapter.java @@ -262,8 +262,12 @@ public class OnboardingNetworkSelectorGridAdapter final NetworkViewHolder networkViewHolder = (NetworkViewHolder) viewHolder; NetworkInfo networkInfo = getNetworkInfo(position); - networkViewHolder.mSelectionCheckbox.setEnabled( - !ALWAYS_SELECTED_CHAIN_IDS.contains(networkInfo.chainId)); + final boolean enableSelection = + !ALWAYS_SELECTED_CHAIN_IDS.contains(networkInfo.chainId); + + networkViewHolder.mSelectionCheckbox.setEnabled(enableSelection); + networkViewHolder.itemView.setEnabled(enableSelection); + boolean selected = mSelectedNetworks.contains(networkInfo.hashCode()); networkViewHolder.mSelectionCheckbox.setChecked(selected); networkViewHolder.itemView.setSelected(selected); diff --git a/android/java/res/color/crypto_wallet_onboarding_button_text_color.xml b/android/java/res/color/crypto_wallet_onboarding_button_text_color.xml index ae9933ec44e..c92dceb0a23 100644 --- a/android/java/res/color/crypto_wallet_onboarding_button_text_color.xml +++ b/android/java/res/color/crypto_wallet_onboarding_button_text_color.xml @@ -8,5 +8,5 @@ + android:color="@color/text_on_primary"/> diff --git a/android/java/res/color/wallet_checkbox_background_color_selector.xml b/android/java/res/color/wallet_checkbox_background_color_selector.xml new file mode 100644 index 00000000000..a57bd7295ab --- /dev/null +++ b/android/java/res/color/wallet_checkbox_background_color_selector.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/android/java/res/color/wallet_checkbox_color_selector.xml b/android/java/res/color/wallet_checkbox_color_selector.xml new file mode 100644 index 00000000000..ae9933ec44e --- /dev/null +++ b/android/java/res/color/wallet_checkbox_color_selector.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/android/java/res/layout/fragment_creating_wallet.xml b/android/java/res/layout/fragment_creating_wallet.xml index 3c16c08e988..bba2aa28e86 100644 --- a/android/java/res/layout/fragment_creating_wallet.xml +++ b/android/java/res/layout/fragment_creating_wallet.xml @@ -1,7 +1,6 @@ + android:textColor="@color/text_primary" + android:textStyle="bold" /> + android:textColor="@color/text_secondary" /> diff --git a/android/java/res/layout/fragment_onboarding_network_selection.xml b/android/java/res/layout/fragment_onboarding_network_selection.xml index d3e5f8e1ebe..d904979fe97 100644 --- a/android/java/res/layout/fragment_onboarding_network_selection.xml +++ b/android/java/res/layout/fragment_onboarding_network_selection.xml @@ -13,7 +13,7 @@ + android:textColor="@color/text_primary" + android:textStyle="bold" /> + android:textColor="@color/text_secondary" /> + android:textColor="@color/text_primary" /> + android:textColor="@color/text_tertiary" /> diff --git a/android/java/res/layout/fragment_secure_password.xml b/android/java/res/layout/fragment_secure_password.xml index 2ce9efd4bff..4046981bf76 100644 --- a/android/java/res/layout/fragment_secure_password.xml +++ b/android/java/res/layout/fragment_secure_password.xml @@ -1,7 +1,6 @@ + android:textStyle="bold" /> + android:textColor="@color/text_secondary" /> + android:textStyle="bold" /> + android:textColor="@color/text_secondary" /> + android:textStyle="bold" /> - - + android:textStyle="bold" /> @@ -187,5 +178,4 @@ - diff --git a/android/java/res/layout/fragment_terms_of_use_wallet.xml b/android/java/res/layout/fragment_terms_of_use_wallet.xml index 412b127dec8..d8bf60539de 100644 --- a/android/java/res/layout/fragment_terms_of_use_wallet.xml +++ b/android/java/res/layout/fragment_terms_of_use_wallet.xml @@ -19,7 +19,7 @@ + android:textStyle="bold" /> + android:textColor="@color/text_secondary" /> + android:gravity="top|start" /> + android:textColor="@color/wallet_text_color" /> + /> + /> diff --git a/android/java/res/layout/view_holder_onboarding_network_selector.xml b/android/java/res/layout/view_holder_onboarding_network_selector.xml index f1a0fc2ce06..df03205e5d9 100644 --- a/android/java/res/layout/view_holder_onboarding_network_selector.xml +++ b/android/java/res/layout/view_holder_onboarding_network_selector.xml @@ -44,15 +44,15 @@ android:layout_marginBottom="4dp"/> + android:gravity="center" /> diff --git a/android/java/res/values-night/brave_colors.xml b/android/java/res/values-night/brave_colors.xml index f6b7a3a539b..2be7c0dba98 100644 --- a/android/java/res/values-night/brave_colors.xml +++ b/android/java/res/values-night/brave_colors.xml @@ -46,11 +46,12 @@ #453e2d #1F1F27 #0D1214 - #7C91FF + #C1C4FF @color/wallet_bg #80EBEEF0 + #251491 #7C91FF #66687B85 #FFB1B0 @@ -133,7 +134,6 @@ #F6F7F8 #84889C - #DADFE1 #C2C4CF #1E2029 #000000 @@ -256,5 +256,6 @@ #F3F5F7 #BECAD0 + #a1b2ba #2A118E diff --git a/android/java/res/values/brave_colors.xml b/android/java/res/values/brave_colors.xml index c7dc349e8d6..6668dfced2e 100644 --- a/android/java/res/values/brave_colors.xml +++ b/android/java/res/values/brave_colors.xml @@ -35,13 +35,13 @@ #F0F2FF #FFFFFF #FFFFFF - #3F39E8 - @color/brave_wallet_dn_button_color - + #3E37D4 + #EDEEF1 #4D687B85 #8021272A + #FFFFFF #3F39E8 #66A1B2BA #B3002A @@ -225,7 +225,6 @@ #0D0F14 #686978 - #3F4E55 #495057 #62757E #F8F9FA @@ -390,6 +389,7 @@ #0D1214 #3f4e55 + #62757e #d5dcff #3F39E8 #d5dcff diff --git a/android/java/res/values/brave_dimens.xml b/android/java/res/values/brave_dimens.xml index 865971f8163..77189ed0e6c 100644 --- a/android/java/res/values/brave_dimens.xml +++ b/android/java/res/values/brave_dimens.xml @@ -50,5 +50,8 @@ 16sp 14sp 12sp + 11sp + 32sp + 22sp 16sp diff --git a/android/java/res/values/brave_styles.xml b/android/java/res/values/brave_styles.xml index 78340c507bf..12d46b66321 100644 --- a/android/java/res/values/brave_styles.xml +++ b/android/java/res/values/brave_styles.xml @@ -73,7 +73,13 @@ + + + + + +