Skip to content

Implement support for landscape layout for BraveWalletDAppsActivity #38672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simoarpe wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Implement support for landscape layout for BraveWalletDAppsActivity #38672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
605e881
Remove orientation lock from Android manifest
simoarpe Jul 29, 2026
788fbc4
Add missing copyright to XML layout
simoarpe Jul 29, 2026
56936e7
Make bottom sheet dialog full width in landscape for smartphones only
simoarpe Jul 29, 2026
4757c50
Introduce landscape layout
simoarpe Jul 29, 2026
b278910
Optimize layout reusability
simoarpe Jul 29, 2026
28d752c
Show single column layout for tablets
simoarpe Jul 29, 2026
d97b536
Fix null model crashes upon orientation changes
simoarpe Jul 29, 2026
9ed4e65
Adjust layouts for SignMessageFragment
simoarpe Jul 29, 2026
3f3c940
Remove unused call to set lines
simoarpe Jul 29, 2026
39bfef5
Remove maxLines from message details layout
simoarpe Jul 29, 2026
bcd1f5a
Remove unused constraint vertical bias
simoarpe Jul 29, 2026
4429eb1
Improve sign_message_text layout width
simoarpe Jul 29, 2026
245205d
Remove unused attributes from XML layouts
simoarpe Jul 29, 2026
679389d
Adjust layouts for SiweMessageFragment
simoarpe Jul 30, 2026
f2756e8
Show scrollbar when content is scrollable
simoarpe Jul 30, 2026
fe4653a
Adjust TwoLineItemBottomSheetFragment cut outs
simoarpe Jul 30, 2026
724ecae
Adjust layouts for SignSolTransactionsFragment
simoarpe Jul 31, 2026
9851a69
Add Javadoc to SignSolTransactionFragment class
simoarpe Jul 31, 2026
9fc49b6
Fix Learn more click listener
simoarpe Jul 31, 2026
fd7cdca
Fix cut outs in WalletBottomSheetDialogFragment
simoarpe Jul 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions android/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,14 @@ android_resources("java_resources") {
"java/brave-res/layout-land/activity_brave_origin_plans.xml",
"java/brave-res/layout-land/activity_brave_vpn_profile.xml",
"java/brave-res/layout-land/activity_vpn_paywall.xml",
"java/brave-res/layout-land/approve_tx_bottom_sheet.xml",
"java/brave-res/layout-land/fragment_sign_message.xml",
"java/brave-res/layout-land/fragment_sign_tx_message.xml",
"java/brave-res/layout-land/fragment_siwe.xml",
"java/brave-res/layout-sw600dp-land/approve_tx_bottom_sheet.xml",
"java/brave-res/layout-sw600dp-land/fragment_sign_message.xml",
"java/brave-res/layout-sw600dp-land/fragment_sign_tx_message.xml",
"java/brave-res/layout-sw600dp-land/fragment_siwe.xml",
"java/brave-res/layout-sw600dp/activity_welcome_onboarding.xml",
"java/brave-res/layout/activity_account_selector.xml",
"java/brave-res/layout/activity_add_account.xml",
Expand All @@ -496,7 +504,9 @@ android_resources("java_resources") {
"java/brave-res/layout/activity_vpn_server_selection.xml",
"java/brave-res/layout/activity_welcome_onboarding.xml",
"java/brave-res/layout/application_item_layout.xml",
"java/brave-res/layout/approve_tx_actions.xml",
"java/brave-res/layout/approve_tx_bottom_sheet.xml",
"java/brave-res/layout/approve_tx_header.xml",
"java/brave-res/layout/auto_reconnect_vpn_tutorial_item_layout.xml",
"java/brave-res/layout/bottom_toolbar.xml",
"java/brave-res/layout/bottom_toolbar_browsing.xml",
Expand Down Expand Up @@ -645,7 +655,13 @@ android_resources("java_resources") {
"java/brave-res/layout/recovery_phrase_item_layout.xml",
"java/brave-res/layout/search_preference.xml",
"java/brave-res/layout/selected_network_item.xml",
"java/brave-res/layout/sign_message_details.xml",
"java/brave-res/layout/sign_message_header.xml",
"java/brave-res/layout/sign_tx_message_details.xml",
"java/brave-res/layout/sign_tx_message_header.xml",
"java/brave-res/layout/sign_warning_container.xml",
"java/brave-res/layout/siwe_details.xml",
"java/brave-res/layout/siwe_header.xml",
"java/brave-res/layout/toolbar_space.xml",
"java/brave-res/layout/tracker_item_layout.xml",
"java/brave-res/layout/view_holder_account_selector.xml",
Expand Down
4 changes: 1 addition & 3 deletions android/java/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,7 @@
android:theme="@style/Theme.Chromium.Activity" />

<activity android:name="org.chromium.chrome.browser.crypto_wallet.activities.BraveWalletDAppsActivity"
android:theme="@style/Theme.Chromium.Activity.FakeTranslucent"
android:screenOrientation="sensorPortrait"
tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
android:theme="@style/Theme.Chromium.Activity.FakeTranslucent" />

<activity
android:name="org.chromium.chrome.browser.vpn.split_tunnel.SplitTunnelActivity"
Expand Down
40 changes: 40 additions & 0 deletions android/java/brave-res/layout-land/approve_tx_bottom_sheet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2026 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 https://mozilla.org/MPL/2.0/.
-->
<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:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".browser.crypto_wallet.fragments.ApproveTxBottomSheetDialogFragment">

<androidx.constraintlayout.widget.Guideline
android:id="@+id/column_divider"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5"
tools:ignore="InconsistentLayout" />

<include
android:id="@+id/header_container"
layout="@layout/approve_tx_header"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/column_divider"
app:layout_constraintTop_toTopOf="parent" />

<include
android:id="@+id/actions_group"
layout="@layout/approve_tx_actions"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintStart_toEndOf="@id/column_divider"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
43 changes: 43 additions & 0 deletions android/java/brave-res/layout-land/fragment_sign_message.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2026 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 https://mozilla.org/MPL/2.0/.
-->
<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:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="20dp"
android:background="@color/wallet_bg"
tools:context=".browser.crypto_wallet.fragments.dapps.SignMessageFragment">

<androidx.constraintlayout.widget.Guideline
android:id="@+id/column_divider"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5"
tools:ignore="InconsistentLayout" />

<include
android:id="@+id/header_container"
layout="@layout/sign_message_header"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/column_divider"
app:layout_constraintTop_toTopOf="parent" />

<include
android:id="@+id/details_container"
layout="@layout/sign_message_details"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintStart_toEndOf="@id/column_divider"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
43 changes: 43 additions & 0 deletions android/java/brave-res/layout-land/fragment_sign_tx_message.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2026 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 https://mozilla.org/MPL/2.0/.
-->
<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:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="20dp"
android:background="@color/wallet_bg"
tools:context=".browser.crypto_wallet.fragments.dapps.SignSolTransactionsFragment">

<androidx.constraintlayout.widget.Guideline
android:id="@+id/column_divider"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5"
tools:ignore="InconsistentLayout" />

<include
android:id="@+id/header_container"
layout="@layout/sign_tx_message_header"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/column_divider"
app:layout_constraintTop_toTopOf="parent" />

<include
android:id="@+id/details_container"
layout="@layout/sign_tx_message_details"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintStart_toEndOf="@id/column_divider"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
64 changes: 64 additions & 0 deletions android/java/brave-res/layout-land/fragment_siwe.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2026 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 https://mozilla.org/MPL/2.0/.
-->
<LinearLayout 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:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/wallet_bg"
android:orientation="vertical"
tools:context=".browser.crypto_wallet.fragments.dapps.SiweMessageFragment">

<TextView
android:id="@+id/frag_siwe_tv_title"
style="@style/BraveWalletTextViewTitle"
android:layout_width="match_parent"
android:layout_marginTop="12dp"
android:gravity="center"
android:text="@string/brave_wallet_sign_in_with_brave_wallet"
android:textSize="20sp" />

<View
android:id="@+id/frag_siwe_div1"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="12dp"
android:background="@color/wallet_edittext_outline_color" />

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="20dp">

<androidx.constraintlayout.widget.Guideline
android:id="@+id/column_divider"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5"
tools:ignore="InconsistentLayout" />

<include
android:id="@+id/header_container"
layout="@layout/siwe_header"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/column_divider"
app:layout_constraintTop_toTopOf="parent" />

<include
android:id="@+id/details_container"
layout="@layout/siwe_details"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintStart_toEndOf="@id/column_divider"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
32 changes: 32 additions & 0 deletions android/java/brave-res/layout-sw600dp-land/approve_tx_bottom_sheet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2026 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 https://mozilla.org/MPL/2.0/.
-->
<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:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".browser.crypto_wallet.fragments.ApproveTxBottomSheetDialogFragment">

<include
android:id="@+id/header_container"
layout="@layout/approve_tx_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<include
android:id="@+id/actions_group"
layout="@layout/approve_tx_actions"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/header_container"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
35 changes: 35 additions & 0 deletions android/java/brave-res/layout-sw600dp-land/fragment_sign_message.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2026 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 https://mozilla.org/MPL/2.0/.
-->
<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:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="20dp"
android:background="@color/wallet_bg"
tools:context=".browser.crypto_wallet.fragments.dapps.SignMessageFragment">

<include
android:id="@+id/header_container"
layout="@layout/sign_message_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<include
android:id="@+id/details_container"
layout="@layout/sign_message_details"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/header_container"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
35 changes: 35 additions & 0 deletions android/java/brave-res/layout-sw600dp-land/fragment_sign_tx_message.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2026 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 https://mozilla.org/MPL/2.0/.
-->
<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:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="20dp"
android:background="@color/wallet_bg"
tools:context=".browser.crypto_wallet.fragments.dapps.SignSolTransactionsFragment">

<include
android:id="@+id/header_container"
layout="@layout/sign_tx_message_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<include
android:id="@+id/details_container"
layout="@layout/sign_tx_message_details"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/header_container"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
Loading
Loading