From 0f62d731ce9f43e45d82eb68f82996c445efe6ce Mon Sep 17 00:00:00 2001 From: deeppandya Date: Mon, 11 Sep 2023 23:08:04 -0400 Subject: [PATCH] Add expandable text view for url Add textview with scroll --- .../chromium/chrome/browser/shields/BraveShieldsHandler.java | 5 ++++- android/java/res/layout/fragment_assets.xml | 2 +- android/java/res/layout/report_broken_site_layout.xml | 3 +++ browser/ui/android/strings/android_brave_strings.grd | 3 --- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java b/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java index 6fe9849a130..c8f4e76c754 100644 --- a/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java +++ b/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java @@ -16,6 +16,7 @@ import android.graphics.Typeface; import android.graphics.drawable.ColorDrawable; import android.os.Build; import android.text.SpannableString; +import android.text.method.ScrollingMovementMethod; import android.text.style.StyleSpan; import android.util.Pair; import android.view.ContextThemeWrapper; @@ -72,6 +73,7 @@ import java.util.Map; */ public class BraveShieldsHandler implements BraveRewardsHelper.LargeIconReadyCallback { private static final String TAG = "BraveShieldsHandler"; + private static final int URL_SPEC_MAX_LINES = 3; private static class BlockersInfo { public BlockersInfo() { @@ -802,7 +804,8 @@ public class BraveShieldsHandler implements BraveRewardsHelper.LargeIconReadyCal private void setUpReportBrokenSiteLayout() { TextView mReportSiteUrlText = mReportBrokenSiteLayout.findViewById(R.id.report_site_url); - mReportSiteUrlText.setText(mHost); + mReportSiteUrlText.setText(mUrlSpec); + mReportSiteUrlText.setMovementMethod(new ScrollingMovementMethod()); Button mCancelButton = mReportBrokenSiteLayout.findViewById(R.id.btn_cancel); mCancelButton.setOnClickListener(new View.OnClickListener() { diff --git a/android/java/res/layout/fragment_assets.xml b/android/java/res/layout/fragment_assets.xml index 4832aa4a4aa..77d97a1c609 100644 --- a/android/java/res/layout/fragment_assets.xml +++ b/android/java/res/layout/fragment_assets.xml @@ -33,7 +33,7 @@ android:gravity="center_vertical" android:paddingStart="16dp" android:paddingEnd="16dp" - android:text="@string/brave_wallet_portfolio_balance_updating" + android:text="@string/ellip_text" android:textColor="@color/wallet_text_color" android:textSize="32sp" android:textStyle="bold" diff --git a/android/java/res/layout/report_broken_site_layout.xml b/android/java/res/layout/report_broken_site_layout.xml index 71f262f75f0..4dcb879044e 100644 --- a/android/java/res/layout/report_broken_site_layout.xml +++ b/android/java/res/layout/report_broken_site_layout.xml @@ -35,6 +35,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="16sp" + android:scrollbars = "vertical" + android:maxLines="3" + android:fadeScrollbars="false" android:textColor="@color/shield_back_button_tint" android:layout_marginBottom="14dp"/> diff --git a/browser/ui/android/strings/android_brave_strings.grd b/browser/ui/android/strings/android_brave_strings.grd index 3f4bb78aa8c..f5526d0439e 100644 --- a/browser/ui/android/strings/android_brave_strings.grd +++ b/browser/ui/android/strings/android_brave_strings.grd @@ -1073,9 +1073,6 @@ This file contains all "about" strings. It is set to NOT be translated, in tran You have %1$s89 days left to claim - - ... - on YouTube