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

Update UI changes

Browse Source
This commit is contained in:
Deep
2022-09-21 17:58:41 -04:00
parent 76a78b0c66
commit 7630244dde
21 changed files with 95 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/brave_java_resources.gni
+15 -1
View File
@@ -55,6 +55,8 @@ brave_java_resources = [
"java/res/drawable-hdpi/ic_ad_free_videos.png",
"java/res/drawable-hdpi/ic_brave_onboarding.png",
"java/res/drawable-hdpi/ic_chrome.png",
"java/res/drawable-hdpi/ic_cookie.png",
"java/res/drawable-hdpi/ic_cookie_background.png",
"java/res/drawable-hdpi/ic_cross_modal.png",
"java/res/drawable-hdpi/ic_delete_white_24dp.png",
"java/res/drawable-hdpi/ic_expand_less_black_24dp.png",
@@ -138,6 +140,8 @@ brave_java_resources = [
"java/res/drawable-mdpi/ic_ad_free_videos.png",
"java/res/drawable-mdpi/ic_brave_onboarding.png",
"java/res/drawable-mdpi/ic_chrome.png",
"java/res/drawable-mdpi/ic_cookie.png",
"java/res/drawable-mdpi/ic_cookie_background.png",
"java/res/drawable-mdpi/ic_cross_modal.png",
"java/res/drawable-mdpi/ic_delete_white_24dp.png",
"java/res/drawable-mdpi/ic_expand_less_black_24dp.png",
@@ -179,6 +183,11 @@ brave_java_resources = [
"java/res/drawable-mdpi/verified_creator_large.png",
"java/res/drawable-mdpi/verified_disclosure.png",
"java/res/drawable-mdpi/yandex.png",
"java/res/drawable-night-hdpi/ic_cookie_background.png",
"java/res/drawable-night-mdpi/ic_cookie_background.png",
"java/res/drawable-night-xhdpi/ic_cookie_background.png",
"java/res/drawable-night-xxhdpi/ic_cookie_background.png",
"java/res/drawable-night-xxxhdpi/ic_cookie_background.png",
"java/res/drawable-nodpi/dylan_malval_sea_min.webp",
"java/res/drawable-nodpi/eth.png",
"java/res/drawable-nodpi/fee_icon.png",
@@ -226,6 +235,8 @@ brave_java_resources = [
"java/res/drawable-xhdpi/ic_ad_free_videos.png",
"java/res/drawable-xhdpi/ic_brave_onboarding.png",
"java/res/drawable-xhdpi/ic_chrome.png",
"java/res/drawable-xhdpi/ic_cookie.png",
"java/res/drawable-xhdpi/ic_cookie_background.png",
"java/res/drawable-xhdpi/ic_cross_modal.png",
"java/res/drawable-xhdpi/ic_delete_white_24dp.png",
"java/res/drawable-xhdpi/ic_expand_less_black_24dp.png",
@@ -308,6 +319,8 @@ brave_java_resources = [
"java/res/drawable-xxhdpi/ic_ad_free_videos.png",
"java/res/drawable-xxhdpi/ic_brave_onboarding.png",
"java/res/drawable-xxhdpi/ic_chrome.png",
"java/res/drawable-xxhdpi/ic_cookie.png",
"java/res/drawable-xxhdpi/ic_cookie_background.png",
"java/res/drawable-xxhdpi/ic_cross_modal.png",
"java/res/drawable-xxhdpi/ic_delete_white_24dp.png",
"java/res/drawable-xxhdpi/ic_expand_less_black_24dp.png",
@@ -389,6 +402,8 @@ brave_java_resources = [
"java/res/drawable-xxxhdpi/ic_ad_free_videos.png",
"java/res/drawable-xxxhdpi/ic_brave_onboarding.png",
"java/res/drawable-xxxhdpi/ic_chrome.png",
"java/res/drawable-xxxhdpi/ic_cookie.png",
"java/res/drawable-xxxhdpi/ic_cookie_background.png",
"java/res/drawable-xxxhdpi/ic_cross_modal.png",
"java/res/drawable-xxxhdpi/ic_delete_white_24dp.png",
"java/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png",
@@ -529,7 +544,6 @@ brave_java_resources = [
"java/res/drawable/ic_close.xml",
"java/res/drawable/ic_close_12.xml",
"java/res/drawable/ic_closing_all_closes_brave.xml",
"java/res/drawable/ic_cookie_background.xml",
"java/res/drawable/ic_copy.xml",
"java/res/drawable/ic_crypto_wallets.xml",
"java/res/drawable/ic_custom_tabs.xml",
android/java/org/chromium/chrome/browser/shields/BraveCookieConsentNotices.java
+4 -4
View File
@@ -20,10 +20,10 @@ public class BraveCookieConsentNotices {
private static final Object lock = new Object();
public static BraveCookieConsentNotices getInstance() {
synchronized(lock) {
if(sInstance == null) {
sInstance = new BraveCookieConsentNotices();
}
synchronized (lock) {
if (sInstance == null) {
sInstance = new BraveCookieConsentNotices();
}
}
return sInstance;
}
android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java
+11 -5
View File
@@ -409,7 +409,11 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout
if (mBraveShieldsButton != null && mBraveShieldsButton.isShown()
&& mBraveShieldsHandler != null && !mBraveShieldsHandler.isShowing()) {
// checkForTooltip(tab);
checkForTooltip(tab);
}
if (mBraveShieldsButton != null && mBraveShieldsButton.isShown()
&& mBraveShieldsHandler != null && !mBraveShieldsHandler.isShowing()
&& !url.getSpec().startsWith(UrlConstants.CHROME_SCHEME)) {
maybeShowCookieConsentTooltip();
}
}
@@ -585,7 +589,8 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout
}
private void maybeShowCookieConsentTooltip() {
if (BraveCookieConsentNotices.getInstance().isAdblockCookieListOptInEnabled()) {
if (BraveCookieConsentNotices.getInstance().isFilterListAvailable()
&& BraveCookieConsentNotices.getInstance().isAdblockCookieListOptInEnabled()) {
showCookieConsentTooltip();
}
}
@@ -594,16 +599,16 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout
ViewGroup viewGroup =
BraveActivity.getBraveActivity().getWindow().getDecorView().findViewById(
android.R.id.content);
// float padding = (float) dpToPx(getContext(), 20);
float padding = (float) dpToPx(getContext(), 20);
mCookieConsentTooltip = new PopupWindowTooltip.Builder(getContext())
.anchorView(mBraveShieldsButton)
.arrowColor(ContextCompat.getColor(
getContext(), R.color.cookie_consent_tooltip_color))
.gravity(Gravity.BOTTOM)
.dismissOnOutsideTouch(false)
.dismissOnOutsideTouch(true)
.dismissOnInsideTouch(false)
.backgroundDimDisabled(false)
// .padding(padding)
.padding(padding)
.parentPaddingHorizontal(dpToPx(getContext(), 10))
.modal(true)
.onDismissListener(tooltip
@@ -617,6 +622,7 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout
btnAction.setOnClickListener((new View.OnClickListener() {
@Override
public void onClick(View v) {
BraveCookieConsentNotices.getInstance().enableFilter();
mCookieConsentTooltip.dismiss();
}
}));
android/java/res/drawable-hdpi/ic_cookie.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

android/java/res/drawable-hdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

android/java/res/drawable-mdpi/ic_cookie.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

android/java/res/drawable-mdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

android/java/res/drawable-night-hdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

android/java/res/drawable-night-mdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.3 KiB

android/java/res/drawable-night-xhdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

android/java/res/drawable-night-xxhdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

android/java/res/drawable-night-xxxhdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

android/java/res/drawable-xhdpi/ic_cookie.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

android/java/res/drawable-xhdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

android/java/res/drawable-xxhdpi/ic_cookie.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

android/java/res/drawable-xxhdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

android/java/res/drawable-xxxhdpi/ic_cookie.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 41 KiB

android/java/res/drawable-xxxhdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

android/java/res/drawable/cookie_consent_tooltip_background.xml
+2 -6
View File
@@ -4,14 +4,10 @@
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/. -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:drawable="@drawable/ic_cookie_background" />
<item>
<shape android:shape="rectangle">
<corners
android:bottomRightRadius="8dp"
android:bottomLeftRadius="8dp"
android:topLeftRadius="8dp"
android:topRightRadius="8dp"/>
<corners android:radius="8dp"/>
</shape>
</item>
<item android:drawable="@drawable/ic_cookie_background" />
</layer-list>
android/java/res/drawable/ic_cookie_background.xml
-61
View File
@@ -1,61 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="200dp"
android:height="200dp"
android:viewportWidth="200"
android:viewportHeight="200">
<group>
<clip-path
android:pathData="M8,0L322,0A8,8 0,0 1,330 8L330,414A8,8 0,0 1,322 422L8,422A8,8 0,0 1,0 414L0,8A8,8 0,0 1,8 0z"/>
<path
android:pathData="M8,0L322,0A8,8 0,0 1,330 8L330,414A8,8 0,0 1,322 422L8,422A8,8 0,0 1,0 414L0,8A8,8 0,0 1,8 0z"
android:fillColor="#1E2029"/>
<path
android:pathData="M249.82,403.44C249.9,403.68 256.92,426.94 238.46,441.38C238.45,441.39 238.43,441.39 238.42,441.4C238.21,441.55 237.99,441.68 237.75,441.76C237.5,441.84 237.25,441.86 236.99,441.86C236.98,441.86 236.96,441.87 236.94,441.87C213.52,441.05 205.52,418.11 205.45,417.87C205.03,416.65 204.37,414.64 203.97,413.41L201.8,406.74C201,404.29 202.35,401.65 204.8,400.85L207.02,400.13C216.35,397.1 218.75,390.21 218.85,389.92C219.09,389.22 219.63,388.73 220.28,388.5C221.01,388.19 221.87,388.22 222.55,388.73C222.79,388.9 228.79,393.05 238.12,390.02L240.34,389.3C242.79,388.5 245.43,389.85 246.23,392.3L248.4,398.97C248.8,400.2 249.44,402.21 249.82,403.44ZM241.79,393.74L239.56,394.46C231.45,397.1 225.3,395.25 222.15,393.79C220.46,396.83 216.58,401.94 208.46,404.58L206.24,405.3L208.41,411.97C208.81,413.18 209.46,415.17 209.87,416.38C210.15,417.19 216.79,435.89 236.24,437.12C251.3,424.62 245.43,405.04 245.37,404.84C244.99,403.62 244.35,401.63 243.95,400.41L241.79,393.74ZM232.69,426.2C226.56,428.19 219.96,424.82 217.97,418.69C215.97,412.57 219.34,405.96 225.46,403.97C231.58,401.98 238.19,405.34 240.18,411.47C242.17,417.6 238.81,424.2 232.69,426.2ZM235.74,412.92C235.4,411.89 234.84,411.01 234.14,410.27L228.17,422.01C229.17,422.14 230.21,422.08 231.24,421.75C234.92,420.55 236.93,416.59 235.74,412.92ZM222.41,417.25C222.74,418.27 223.31,419.15 224.01,419.89L229.98,408.15C228.98,408.02 227.93,408.08 226.9,408.41C223.23,409.61 221.21,413.57 222.41,417.25Z"
android:strokeAlpha="0.4"
android:fillColor="#343A40"
android:fillType="evenOdd"
android:fillAlpha="0.4"/>
<path
android:pathData="M176.57,360.08C176.57,360.16 176.42,367.53 169.74,369.96C169.74,369.96 169.73,369.96 169.73,369.96C169.65,369.98 169.58,370 169.5,370C169.42,370 169.35,369.98 169.27,369.96C169.27,369.96 169.26,369.96 169.26,369.96C162.58,367.53 162.43,360.16 162.42,360.08C162.42,359.69 162.42,359.05 162.42,358.66V356.53C162.42,355.75 163.05,355.11 163.83,355.11H164.54C167.52,355.11 168.86,353.35 168.91,353.28C169.04,353.1 169.25,353.01 169.46,353C169.7,352.98 169.94,353.07 170.09,353.28C170.14,353.35 171.48,355.11 174.46,355.11H175.17C175.95,355.11 176.58,355.75 176.58,356.53V358.66C176.58,359.05 176.58,359.69 176.57,360.08ZM175.17,356.53H174.46C171.87,356.53 170.27,355.42 169.5,354.71C168.73,355.42 167.13,356.53 164.54,356.53H163.83V358.66C163.83,359.05 163.84,359.68 163.84,360.07C163.85,360.33 164.01,366.34 169.5,368.52C175.02,366.33 175.16,360.13 175.16,360.07C175.16,359.68 175.17,359.05 175.17,358.66V356.53ZM169.5,365.04C167.55,365.04 165.96,363.45 165.96,361.49C165.96,359.54 167.55,357.95 169.5,357.95C171.45,357.95 173.04,359.54 173.04,361.49C173.04,363.45 171.45,365.04 169.5,365.04ZM171.63,361.49C171.63,361.17 171.54,360.86 171.41,360.58L168.59,363.41C168.87,363.54 169.17,363.62 169.5,363.62C170.67,363.62 171.63,362.67 171.63,361.49ZM167.38,361.49C167.38,361.82 167.46,362.13 167.59,362.41L170.41,359.58C170.13,359.45 169.83,359.37 169.5,359.37C168.33,359.37 167.38,360.32 167.38,361.49Z"
android:strokeAlpha="0.78"
android:fillColor="#343A40"
android:fillType="evenOdd"
android:fillAlpha="0.78"/>
<path
android:pathData="M282.88,364.33C282.83,364.44 278.1,375.62 266.4,375.27C266.4,375.27 266.39,375.27 266.38,375.27C266.25,375.26 266.13,375.24 266.01,375.19C265.89,375.14 265.78,375.07 265.68,374.99C265.68,374.99 265.67,374.98 265.66,374.98C256.93,367.19 261.17,355.82 261.22,355.71C261.45,355.11 261.84,354.12 262.08,353.52L263.37,350.27C263.85,349.07 265.21,348.49 266.4,348.96L267.49,349.39C272.04,351.2 275.16,349.33 275.29,349.25C275.61,349.05 275.97,349.04 276.29,349.15C276.67,349.27 276.99,349.56 277.09,349.97C277.13,350.11 278.11,353.62 282.66,355.43L283.74,355.86C284.94,356.34 285.53,357.7 285.05,358.9L283.75,362.15C283.52,362.75 283.12,363.73 282.88,364.33ZM282.88,358.03L281.8,357.6C277.84,356.03 276.07,353.36 275.32,351.79C273.7,352.41 270.58,353.14 266.62,351.56L265.54,351.13L264.24,354.39C264.01,354.98 263.63,355.95 263.4,356.55C263.24,356.95 259.83,366.25 266.91,372.93C276.68,372.93 280.68,363.54 280.72,363.44C280.96,362.85 281.35,361.88 281.59,361.29L282.88,358.03ZM269.03,367.6C266.04,366.41 264.58,363.01 265.77,360.02C266.96,357.03 270.36,355.56 273.35,356.75C276.33,357.94 277.8,361.34 276.61,364.33C275.42,367.32 272.02,368.79 269.03,367.6ZM274.44,363.47C274.64,362.97 274.7,362.45 274.67,361.95L268.63,364.55C268.97,364.92 269.39,365.23 269.89,365.43C271.69,366.14 273.73,365.26 274.44,363.47ZM267.94,360.88C267.74,361.38 267.67,361.9 267.71,362.41L273.75,359.8C273.4,359.43 272.98,359.12 272.48,358.92C270.69,358.21 268.65,359.09 267.94,360.88Z"
android:strokeAlpha="0.44"
android:fillColor="#343A40"
android:fillType="evenOdd"
android:fillAlpha="0.44"/>
<path
android:pathData="M385.69,368.38C385.64,368.65 380.79,395.97 354.55,401.15C354.52,401.15 354.51,401.14 354.49,401.14C354.2,401.2 353.91,401.21 353.62,401.16C353.33,401.12 353.05,401.02 352.8,400.88C352.78,400.87 352.76,400.87 352.74,400.86C329.32,387.95 333.01,360.45 333.05,360.18C333.26,358.72 333.62,356.33 333.85,354.87L335.08,346.96C335.53,344.05 338.26,342.05 341.17,342.51L343.8,342.92C354.87,344.64 360.87,338.87 361.12,338.63C361.73,338.03 362.53,337.82 363.31,337.91C364.21,337.98 365.07,338.45 365.51,339.32C365.66,339.62 369.63,346.94 380.69,348.67L383.33,349.08C386.23,349.53 388.23,352.27 387.77,355.17L386.54,363.08C386.32,364.54 385.93,366.92 385.69,368.38ZM382.51,354.35L379.87,353.94C370.24,352.44 364.94,347.39 362.48,344.27C359.2,346.49 352.61,349.69 342.98,348.19L340.35,347.78L339.11,355.69C338.89,357.13 338.54,359.5 338.33,360.94C338.19,361.9 335.3,384.37 354.47,395.66C376.27,390.7 380.39,367.74 380.43,367.5C380.67,366.06 381.05,363.7 381.27,362.26L382.51,354.35ZM356.49,382.71C349.23,381.58 344.24,374.74 345.38,367.47C346.51,360.2 353.34,355.21 360.6,356.34C367.87,357.47 372.86,364.31 371.72,371.58C370.59,378.85 363.76,383.84 356.49,382.71ZM366.45,370.76C366.64,369.54 366.52,368.35 366.19,367.24L354.05,376.11C355.01,376.77 356.1,377.24 357.32,377.43C361.67,378.11 365.77,375.12 366.45,370.76ZM350.64,368.29C350.45,369.51 350.58,370.7 350.91,371.81L363.05,362.93C362.09,362.28 361,361.8 359.78,361.61C355.42,360.93 351.33,363.93 350.64,368.29Z"
android:strokeAlpha="0.44"
android:fillColor="#343A40"
android:fillType="evenOdd"
android:fillAlpha="0.44"/>
<path
android:pathData="M14.69,420.38C14.64,420.65 9.79,447.97 -16.46,453.15C-16.48,453.15 -16.49,453.14 -16.51,453.14C-16.8,453.2 -17.09,453.21 -17.38,453.16C-17.67,453.12 -17.95,453.02 -18.2,452.88C-18.22,452.87 -18.24,452.87 -18.26,452.86C-41.69,439.95 -37.99,412.45 -37.95,412.18C-37.74,410.72 -37.38,408.33 -37.16,406.87L-35.92,398.96C-35.47,396.05 -32.74,394.05 -29.83,394.51L-27.2,394.92C-16.13,396.64 -10.13,390.87 -9.88,390.63C-9.28,390.03 -8.47,389.82 -7.69,389.91C-6.79,389.98 -5.93,390.45 -5.49,391.32C-5.34,391.62 -1.37,398.94 9.69,400.67L12.33,401.08C15.23,401.53 17.23,404.27 16.77,407.17L15.54,415.08C15.31,416.54 14.93,418.92 14.69,420.38ZM11.5,406.35L8.87,405.94C-0.76,404.44 -6.06,399.39 -8.52,396.27C-11.8,398.49 -18.39,401.69 -28.02,400.19L-30.65,399.78L-31.89,407.69C-32.11,409.13 -32.47,411.5 -32.67,412.94C-32.81,413.9 -35.7,436.37 -16.53,447.66C5.26,442.7 9.39,419.74 9.43,419.5C9.67,418.06 10.05,415.7 10.27,414.26L11.5,406.35ZM-14.51,434.71C-21.77,433.58 -26.76,426.74 -25.63,419.47C-24.49,412.2 -17.66,407.21 -10.4,408.34C-3.13,409.47 1.86,416.31 0.72,423.58C-0.41,430.85 -7.24,435.84 -14.51,434.71ZM-4.55,422.76C-4.36,421.54 -4.48,420.35 -4.81,419.24L-16.95,428.11C-15.99,428.77 -14.9,429.24 -13.68,429.43C-9.33,430.11 -5.23,427.12 -4.55,422.76ZM-20.36,420.29C-20.55,421.51 -20.42,422.7 -20.09,423.81L-7.95,414.93C-8.91,414.28 -10,413.8 -11.22,413.61C-15.58,412.93 -19.68,415.93 -20.36,420.29Z"
android:strokeAlpha="0.44"
android:fillColor="#343A40"
android:fillType="evenOdd"
android:fillAlpha="0.44"/>
<path
android:pathData="M49.18,341.57C49.21,341.79 52.02,363.63 33.37,373.78C33.35,373.79 33.34,373.79 33.32,373.8C33.12,373.9 32.9,373.98 32.67,374.02C32.44,374.05 32.21,374.04 31.98,374C31.96,374 31.95,374 31.93,374C11.12,369.78 7.39,348.07 7.36,347.85C7.17,346.7 6.87,344.8 6.7,343.64L5.76,337.36C5.41,335.05 7,332.89 9.31,332.54L11.41,332.23C20.2,330.9 23.38,325.11 23.51,324.86C23.82,324.27 24.38,323.92 24.99,323.8C25.69,323.64 26.45,323.79 27,324.35C27.18,324.53 31.92,329.14 40.71,327.82L42.81,327.51C45.12,327.16 47.28,328.76 47.62,331.07L48.57,337.35C48.74,338.51 49.02,340.41 49.18,341.57ZM43.44,331.7L41.34,332.01C33.69,333.16 28.48,330.59 25.88,328.82C23.92,331.28 19.69,335.27 12.04,336.42L9.94,336.73L10.89,343.02C11.06,344.16 11.35,346.04 11.54,347.18C11.66,347.94 14.81,365.64 32.01,369.64C47.34,360.72 45.01,342.34 44.98,342.15C44.83,341.01 44.55,339.13 44.38,337.98L43.44,331.7ZM30.47,359.35C24.7,360.22 19.29,356.23 18.43,350.45C17.56,344.68 21.55,339.27 27.32,338.4C33.09,337.54 38.49,341.53 39.36,347.31C40.23,353.08 36.24,358.49 30.47,359.35ZM35.17,347.94C35.03,346.97 34.66,346.1 34.14,345.34L27.05,354.94C27.93,355.21 28.87,355.31 29.84,355.16C33.3,354.64 35.69,351.4 35.17,347.94ZM22.61,349.82C22.76,350.79 23.13,351.66 23.65,352.42L30.74,342.82C29.86,342.55 28.92,342.45 27.95,342.59C24.49,343.11 22.09,346.36 22.61,349.82Z"
android:strokeAlpha="0.44"
android:fillColor="#343A40"
android:fillType="evenOdd"
android:fillAlpha="0.44"/>
<path
android:pathData="M114.05,391.79C114.05,391.93 113.38,405.42 101.02,409.52C101.01,409.52 101,409.52 100.99,409.52C100.86,409.57 100.71,409.59 100.57,409.59C100.43,409.58 100.29,409.55 100.16,409.5C100.15,409.5 100.14,409.5 100.13,409.5C88.03,404.69 88.13,391.19 88.13,391.05C88.14,390.33 88.17,389.16 88.19,388.44L88.3,384.55C88.34,383.11 89.54,381.98 90.97,382.02L92.27,382.06C97.72,382.21 100.26,379.06 100.37,378.93C100.62,378.6 101,378.45 101.38,378.45C101.82,378.42 102.26,378.6 102.53,378.99C102.62,379.13 104.99,382.42 110.43,382.58L111.73,382.62C113.16,382.66 114.29,383.86 114.25,385.29L114.14,389.18C114.12,389.9 114.08,391.08 114.05,391.79ZM111.66,385.21L110.36,385.18C105.62,385.04 102.75,382.92 101.37,381.57C99.92,382.84 96.94,384.79 92.19,384.66L90.9,384.62L90.78,388.52C90.76,389.23 90.74,390.39 90.73,391.1C90.72,391.57 90.7,402.6 100.65,406.88C110.87,403.15 111.45,391.81 111.46,391.69C111.49,390.98 111.53,389.82 111.55,389.11L111.66,385.21ZM100.83,400.5C97.25,400.4 94.43,397.4 94.53,393.82C94.63,390.24 97.63,387.41 101.2,387.51C104.78,387.62 107.61,390.61 107.5,394.19C107.4,397.77 104.41,400.6 100.83,400.5ZM104.91,394.12C104.93,393.52 104.8,392.95 104.57,392.44L99.25,397.46C99.75,397.72 100.31,397.88 100.91,397.9C103.05,397.96 104.85,396.27 104.91,394.12ZM97.12,393.89C97.11,394.49 97.24,395.06 97.47,395.58L102.79,390.55C102.29,390.29 101.73,390.13 101.13,390.11C98.98,390.05 97.19,391.75 97.12,393.89Z"
android:strokeAlpha="0.44"
android:fillColor="#343A40"
android:fillType="evenOdd"
android:fillAlpha="0.44"/>
<path
android:pathData="M344.9,301.42C344.9,301.53 344.67,312.36 334.86,315.94C334.85,315.94 334.84,315.94 334.83,315.94C334.73,315.98 334.61,316 334.5,316C334.39,316 334.27,315.98 334.17,315.94C334.16,315.94 334.15,315.94 334.14,315.94C324.33,312.36 324.1,301.53 324.1,301.42C324.09,300.84 324.08,299.9 324.08,299.32V296.2C324.08,295.05 325.02,294.11 326.17,294.11H327.21C331.58,294.11 333.55,291.52 333.64,291.41C333.83,291.14 334.13,291.02 334.44,291C334.79,290.98 335.15,291.11 335.37,291.42C335.45,291.52 337.42,294.11 341.79,294.11H342.83C343.98,294.11 344.92,295.05 344.92,296.2V299.32C344.92,299.9 344.91,300.84 344.9,301.42ZM342.83,296.2H341.79C337.99,296.2 335.64,294.56 334.5,293.51C333.36,294.56 331.02,296.2 327.21,296.2H326.17V299.32C326.17,299.89 326.17,300.83 326.18,301.4C326.18,301.77 326.42,310.62 334.5,313.82C342.61,310.6 342.82,301.49 342.82,301.4C342.83,300.83 342.83,299.89 342.83,299.32V296.2ZM334.5,308.7C331.63,308.7 329.29,306.36 329.29,303.49C329.29,300.62 331.63,298.28 334.5,298.28C337.37,298.28 339.71,300.62 339.71,303.49C339.71,306.36 337.37,308.7 334.5,308.7ZM337.63,303.49C337.63,303.01 337.51,302.56 337.31,302.15L333.16,306.3C333.57,306.5 334.02,306.62 334.5,306.62C336.22,306.62 337.63,305.22 337.63,303.49ZM331.38,303.49C331.38,303.97 331.49,304.42 331.69,304.83L335.84,300.68C335.43,300.48 334.98,300.36 334.5,300.36C332.78,300.36 331.38,301.77 331.38,303.49Z"
android:strokeAlpha="0.78"
android:fillColor="#343A40"
android:fillType="evenOdd"
android:fillAlpha="0.78"/>
</group>
</vector>
android/java/res/layout/block_cookie_consent_notices_tooltip.xml
+63 -54
View File
@@ -4,68 +4,77 @@
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/. -->
<LinearLayout
<ScrollView
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:id="@+id/shields_tooltip_layout"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/cookie_consent_tooltip_background">
android:background="@drawable/cookie_consent_tooltip_background"
android:fadeScrollbars="false">
<ImageView
android:id="@+id/account_picture"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center_horizontal"
app:srcCompat="@drawable/ic_eth_24"
android:contentDescription="@null" />
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="24sp"
android:layout_marginTop="22dp"
android:layout_marginBottom="16dp"
android:gravity="center_horizontal"
android:text="@string/block_cookie_notices_title"
android:textColor="@color/cookie_consent_text_color"/>
<ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginTop="24dp"
android:layout_gravity="center_horizontal"
app:srcCompat="@drawable/ic_cookie"
android:contentDescription="@null" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:layout_marginBottom="32dp"
android:gravity="center_horizontal"
android:text="@string/block_cookie_notices_text"
android:textColor="@color/cookie_consent_text_color"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="24sp"
android:layout_marginTop="22dp"
android:layout_marginBottom="16dp"
android:gravity="center_horizontal"
android:text="@string/block_cookie_notices_title"
android:textColor="@color/cookie_consent_text_color"/>
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_action"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:background="@drawable/crypto_wallet_blue_button"
android:text="@string/block_cookie_notices_action_text"
android:textAllCaps="false"
android:textSize="14sp"
android:paddingVertical="8dp"
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:layout_marginBottom="16dp"
android:textColor="@android:color/white"
style="?android:attr/borderlessButtonStyle"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:layout_marginBottom="32dp"
android:gravity="center_horizontal"
android:text="@string/block_cookie_notices_text"
android:textColor="@color/cookie_consent_text_color"/>
<TextView
android:id="@+id/txt_no_thanks"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="30dp"
android:text="@string/no_thanks"
android:textAlignment="center"
android:textColor="@color/cookie_consent_action_color"
android:textSize="14sp" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_action"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:background="@drawable/crypto_wallet_blue_button"
android:text="@string/block_cookie_notices_action_text"
android:textAllCaps="false"
android:textSize="14sp"
android:paddingVertical="8dp"
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:layout_marginBottom="16dp"
android:textColor="@android:color/white"
style="?android:attr/borderlessButtonStyle"/>
</LinearLayout>
<TextView
android:id="@+id/txt_no_thanks"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="30dp"
android:text="@string/no_thanks"
android:textAlignment="center"
android:textColor="@color/cookie_consent_action_color"
android:textSize="14sp" />
</LinearLayout>
</ScrollView>