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

Siwe android UI updates (#20293)

Browse Source 
* Update error dialog to 2.0 design

* Update account and error dialog per 2.0

* Fix error dialog UI
This commit is contained in:
Pavneet Singh
2023-09-28 09:50:15 +05:30
committed by GitHub
parent 3c2401f1c6
commit 5cc1421d7f
9 changed files with 147 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/res/layout/brave_permission_prompt_dialog.xml
+101 -89
View File
@@ -4,108 +4,120 @@
License, v. 2.0. If a copy of the MPL was not distributed with this file,
You can obtain one at https://mozilla.org/MPL/2.0/. */ -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout 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"
android:orientation="vertical"
android:gravity="start"
style="@style/AlertDialogContent">
<ImageView
android:id="@+id/favicon"
android:layout_height="60dp"
android:layout_width="60dp"
android:layout_gravity="center_horizontal"
android:contentDescription="@null"
android:visibility="gone"/>
<TextView
android:id="@+id/domain"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginBottom="16dp"
android:gravity="center"
android:textColor="@color/wallet_text_color"
android:textSize="15sp" />
style="@style/AlertDialogContent"
android:background="@color/brave_wallet_dn_panel_bg"
android:gravity="start">
<TextView
android:id="@+id/title"
style="@style/BraveWalletTextViewTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:layout_marginVertical="4dp"
android:gravity="center"
android:textColor="@color/wallet_text_color"
android:text="@string/permissions_connect_brave_wallet_title"
android:textSize="16sp" />
android:textSize="20sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/permission_prompt_div"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="6dp"
android:background="@color/wallet_edittext_outline_color"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title" />
<com.google.android.material.card.MaterialCardView
android:id="@+id/permission_prompt_fav_container"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_marginTop="16dp"
android:elevation="12dp"
android:visibility="gone"
app:cardCornerRadius="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/permission_prompt_div"
app:strokeColor="@color/brave_white"
app:strokeWidth="1dp">
<ImageView
android:id="@+id/favicon"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/accessibility_wallet_dapp_panel_account"
tools:srcCompat="@drawable/ic_brave_logo" />
</com.google.android.material.card.MaterialCardView>
<TextView
android:id="@+id/domain"
style="@style/BraveWalletTextView"
android:layout_width="match_parent"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
android:gravity="center"
android:textSize="15sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/permission_prompt_fav_container" />
<TextView
android:id="@+id/sub_title"
style="@style/BraveWalletTextViewTitle"
android:layout_width="match_parent"
android:layout_marginVertical="8dp"
android:text="@string/permissions_connect_brave_wallet_sub_title"
app:layout_constraintBottom_toTopOf="@id/permission_prompt_div2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/domain" />
<View
android:id="@+id/permission_prompt_div2"
android:layout_width="wrap_content"
android:layout_height="1dp"
android:background="@color/wallet_edittext_outline_color"
app:layout_constraintBottom_toTopOf="@id/permission_prompt_cv_accounts"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/sub_title" />
<com.google.android.material.card.MaterialCardView
android:id="@+id/permission_prompt_cv_accounts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:gravity="center"
android:text="@string/permissions_connect_brave_wallet_sub_title"
android:textColor="@color/wallet_text_color"
android:textSize="14sp" />
android:layout_marginVertical="8dp"
android:elevation="12dp"
app:cardCornerRadius="12dp"
app:layout_constrainedHeight="true"
app:layout_constraintBottom_toTopOf="@id/permission_prompt_div3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/permission_prompt_div2">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/accounts_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/brave_wallet_dn_highlight_bg_color"
android:padding="12dp" />
</com.google.android.material.card.MaterialCardView>
<View
android:id="@+id/permission_prompt_div3"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="8dp"
android:background="@color/wallet_edittext_outline_color"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/permission_prompt_cv_accounts" />
<TextView
android:id="@+id/title_accounts"
android:id="@+id/warning_title"
style="@style/BraveWalletTextViewTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:layout_marginBottom="10dp"
android:text="@string/permissions_connect_brave_wallet_accounts_title"
android:textColor="@color/wallet_text_color"
android:textSize="14sp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_alignParentTop="true"
android:background="@color/wallet_edittext_outline_color" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="15dp"
android:paddingBottom="25dp"
android:fillViewport="true" >
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/accounts_list"
android:layout_width="match_parent"
android:layout_height="0dp" />
</ScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/wallet_edittext_outline_color" />
<TextView
android:id="@+id/warning_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="4dp"
android:text="@string/permissions_connect_brave_wallet_warning_title"
android:textColor="@color/wallet_text_color"
android:textSize="14sp" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
android:layout_marginVertical="8dp"
android:text="@string/permissions_connect_brave_wallet_warning_title"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/permission_prompt_div3" />
</androidx.constraintlayout.widget.ConstraintLayout>
android/java/res/layout/fragment_sign_message_error.xml
+18 -24
View File
@@ -10,31 +10,29 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/brave_wallet_dn_panel_bg"
android:padding="20dp"
android:background="@color/wallet_bg"
tools:context=".browser.crypto_wallet.fragments.dapps.SignMessageErrorFragment" >
tools:context=".browser.crypto_wallet.fragments.dapps.SignMessageErrorFragment">
<TextView
android:id="@+id/fragment_sign_msg_err_tv_top_header"
style="@style/BraveWalletTextViewTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="4dp"
android:gravity="center"
android:textStyle="bold"
android:text="@string/brave_wallet_security_risk_detected"
android:textSize="20sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:textColor="@color/wallet_text_color"
android:textSize="15sp" />
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/fragment_sign_msg_err_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:layout_marginHorizontal="16dp"
android:background="?android:attr/listDivider"
app:layout_constraintTop_toBottomOf="@+id/fragment_sign_msg_err_tv_top_header" />
@@ -52,46 +50,43 @@
<ImageView
android:id="@+id/fragment_sign_msg_err_exclamation_icon"
android:layout_marginTop="16dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="16dp"
android:adjustViewBounds="true"
android:contentDescription="@null"
android:gravity="center"
android:maxWidth="48dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_warning_circle"
app:tint="@color/wallet_sign_msg_err_icon_color" />
app:srcCompat="@drawable/ic_warning_circle_filled" />
<TextView
android:id="@+id/fragment_sign_msg_err_tv_host"
style="@style/BraveWalletTextViewTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="4dp"
android:gravity="center"
android:textColor="@color/wallet_sign_msg_err_message_color"
app:layout_constraintTop_toBottomOf="parent" />
<TextView
android:id="@+id/fragment_sign_msg_err_tv_url"
style="@style/BraveWalletTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="4dp"
android:gravity="center"
android:textColor="@color/wallet_sign_msg_err_icon_color"
android:textColor="@color/brave_theme_error_txt"
app:layout_constraintTop_toBottomOf="@id/fragment_sign_msg_err_tv_host" />
<TextView
android:id="@+id/fragment_sign_msg_err_tv_reason"
style="@style/BraveWalletTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/wallet_sign_msg_err_message_color"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="34dp"
android:layout_marginHorizontal="16dp"
android:gravity="center"
app:layout_constraintTop_toBottomOf="@id/fragment_sign_msg_err_tv_url" />
</LinearLayout>
@@ -100,9 +95,8 @@
android:id="@+id/fragment_sign_msg_err_btn_close"
style="@style/BraveWalletButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_weight="1"
app:layout_constraintTop_toBottomOf="@id/fragment_sign_msg_err_block"
android:text="@string/close_text" />
android:text="@string/close_text"
app:layout_constraintTop_toBottomOf="@id/fragment_sign_msg_err_block" />
</androidx.constraintlayout.widget.ConstraintLayout>
android/java/res/values-night/brave_colors.xml
+1
View File
@@ -135,6 +135,7 @@
<color name="recovery_phrase_warning_text_color">#C2C4CF</color>
<color name="wallet_top_banner_color">#33E32444</color>
<color name="wallet_error_text_color">#FF4B6A</color>
<color name="wallet_sign_msg_err_bg_color">#FF460A10</color>
<color name="rewards_panel_bg_color">#17171F</color>
<color name="rewards_panel_text_color">#FFFFFF</color>
android/java/res/values/brave_colors.xml
+1 -3
View File
@@ -235,9 +235,7 @@
<color name="wallet_top_banner_color">#33E32444</color>
<color name="wallet_error_text_color">#FF4B6A</color>
<color name="wallet_sign_msg_err_icon_color">#E6667C</color>
<color name="wallet_sign_msg_err_message_color">#E8E6E7</color>
<color name="wallet_sign_msg_err_bg_color">#FF44141B</color>
<color name="wallet_sign_msg_err_bg_color">#FFF1F1</color>
<color name="vpn_callout_bg_color">#381E85</color>
<color name="brave_plan_bg">#27155E</color>