Set default improvements android
This commit is contained in:
tapanmodh
@@ -0,0 +1,25 @@
|
||||
<vector android:autoMirrored="true" android:height="37dp"
|
||||
android:viewportHeight="37" android:viewportWidth="37"
|
||||
android:width="37dp" xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillType="evenOdd" android:pathData="M34.4958,11.8923L33.3645,8.8803L34.1505,7.1501C34.2515,6.9273 34.2029,6.666 34.0281,6.4931L31.8898,4.3717C30.9547,3.4447 29.5594,3.126 28.3027,3.5535L27.7049,3.7567L24.5817,0.2568H19.9872H17.0754H13.0978L10.0146,3.7991L9.4333,3.5985C8.165,3.1608 6.753,3.483 5.8118,4.4246L3.6356,6.5857C3.496,6.7241 3.4577,6.9318 3.5388,7.1092L4.36,8.9051L3.2344,11.9156L3.963,14.6298L7.2812,27.0015C7.6633,28.428 8.5437,29.6771 9.7683,30.5325C9.7683,30.5325 13.7971,33.3187 17.7728,35.8492C18.1224,36.072 18.488,36.2347 18.8804,36.2287C19.2728,36.234 19.6384,36.072 19.9872,35.8481C24.4525,32.9782 27.9852,30.5212 27.9852,30.5212C29.2087,29.6643 30.0876,28.4137 30.4682,26.9868L33.7707,14.6103L34.4958,11.8923Z">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient android:endX="34.4958" android:endY="36.4827"
|
||||
android:startX="3.23438" android:startY="36.4827" android:type="linear">
|
||||
<item android:color="#FFFF5500" android:offset="0"/>
|
||||
<item android:color="#FFFF5500" android:offset="0.409877"/>
|
||||
<item android:color="#FFFF4530" android:offset="0.49434"/>
|
||||
<item android:color="#FFFF2000" android:offset="0.572365"/>
|
||||
<item android:color="#FFFF2000" android:offset="1"/>
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
<path android:fillType="evenOdd" android:pathData="M30.9652,12.4893L30.9135,12.6506L30.8311,12.9398C30.6113,13.2083 30.1478,13.7237 29.8008,14.0856L26.6108,17.4101C26.2638,17.7717 26.068,18.2252 26.266,18.682L26.6963,19.7216C26.8939,20.1781 26.9134,20.9334 26.7238,21.4405C26.5312,21.9566 26.1995,22.4127 25.7647,22.7604L25.4319,23.0263C25.0393,23.3402 24.3437,23.4227 23.8859,23.2093L22.4166,22.526C21.9593,22.3133 21.2767,21.8673 20.8998,21.535L19.5098,20.3101C19.2386,20.0708 19.2233,19.6597 19.4757,19.4024L22.8609,17.1633C23.2807,16.8858 23.503,16.3723 23.2643,15.9346L22.0608,13.7878C21.8221,13.3497 21.7268,12.768 21.8486,12.4946C21.9708,12.2212 22.458,11.8536 22.9322,11.6777L26.8618,10.2465C27.3356,10.0706 27.3103,9.889 26.8059,9.8425L24.2949,9.6595C23.7901,9.613 23.4202,9.685 22.9322,9.8185L21.0317,10.2795C20.5437,10.413 20.4405,10.922 20.5321,11.4095L21.3162,15.5772C21.4081,16.0652 21.4529,16.5565 21.4161,16.6694C21.3794,16.7823 20.945,16.9642 20.4509,17.0741L19.8009,17.2185C19.3068,17.3284 18.497,17.3332 18.0018,17.2301L17.2154,17.0658C16.7197,16.9623 16.2842,16.7853 16.2471,16.6728C16.2103,16.5599 16.2547,16.0678 16.3463,15.5802L17.1254,11.4118C17.2169,10.9238 17.113,10.4156 16.625,10.2825L14.7238,9.8238C14.2358,9.6906 13.8655,9.6201 13.361,9.6666L10.8501,9.8519C10.3456,9.8988 10.3207,10.0803 10.7945,10.2555L14.7264,11.6826C15.2003,11.8581 15.6882,12.2249 15.8104,12.4983C15.933,12.7714 15.838,13.3531 15.6001,13.7912L14.3989,15.9388C14.161,16.3768 14.3836,16.8903 14.8038,17.1675L18.1921,19.4032C18.4449,19.6601 18.43,20.0716 18.1592,20.3108L16.7703,21.5377C16.3942,21.8703 15.712,22.3167 15.2546,22.5305L13.7865,23.2157C13.3291,23.4291 12.6332,23.3477 12.2405,23.0345L11.9077,22.769C11.4722,22.4217 11.1397,21.966 10.931,21.409C10.7563,20.9428 10.7747,20.1882 10.9716,19.731L11.401,18.6914C11.5983,18.2342 11.4017,17.7807 11.0543,17.4195L7.8605,14.0987C7.5135,13.7375 7.0493,13.2226 6.8294,12.9548L6.7463,12.6652L6.6946,12.504C6.6896,12.3183 6.7574,11.7265 6.8344,11.5663C6.9114,11.4069 7.2063,10.9396 7.4902,10.5285L8.1735,9.538C8.4573,9.1269 8.948,8.4732 9.2636,8.085L10.2652,6.8548C10.5809,6.467 10.8501,6.1512 10.8907,6.1538C10.8926,6.1512 11.3013,6.2258 11.7989,6.3192L13.3161,6.6046C13.8137,6.698 14.3626,6.8008 14.5361,6.8327C14.7092,6.8649 15.2455,6.7659 15.7277,6.6129L16.819,6.2667C17.3008,6.1133 18.0324,5.9115 18.4442,5.8178L18.8257,5.8234L19.2072,5.8174C19.6189,5.9104 20.3505,6.1114 20.8328,6.2641L21.9248,6.6091C22.407,6.7618 22.9433,6.8601 23.1164,6.8278C23.2654,6.8001 23.6907,6.7196 24.1229,6.6378L24.336,6.5975L25.8528,6.311C26.3504,6.2168 26.7591,6.1418 26.7882,6.1441C26.8016,6.1418 27.0709,6.4565 27.3873,6.8447L28.3904,8.0737C28.7068,8.4612 29.1979,9.1142 29.4824,9.5252L30.1669,10.5146C30.4511,10.9253 30.8951,11.6728 30.9227,11.8427C30.951,12.0126 30.9698,12.3037 30.9652,12.4893ZM19.0325,22.4102C19.0769,22.4102 19.4967,22.5651 19.9648,22.7553L20.3992,22.9315C20.8672,23.1213 21.6203,23.4604 22.0719,23.685L23.3535,24.3226C23.8051,24.5469 23.8377,24.967 23.4255,25.2558L22.3323,26.0217C21.9202,26.3105 21.2721,26.8115 20.8925,27.1363C20.7867,27.2268 20.6623,27.3331 20.5297,27.4464C20.186,27.7402 19.7871,28.0812 19.514,28.3148C19.1355,28.6385 18.5223,28.64 18.1511,28.3189C17.7796,27.9975 17.1648,27.4713 16.7845,27.1498C16.4045,26.828 15.7549,26.3307 15.3408,26.0449L14.2515,25.291C13.8374,25.0045 13.8669,24.5826 14.3162,24.3534L15.6047,23.6963C16.054,23.4668 16.8044,23.1232 17.2725,22.9334L17.7068,22.7564C18.1745,22.5662 18.5939,22.4102 18.6388,22.4102H18.8356H19.0325Z">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient android:endX="30.1813" android:endY="33.8764"
|
||||
android:startX="18.8301" android:startY="33.8764" android:type="linear">
|
||||
<item android:color="#FFFFFFFF" android:offset="0"/>
|
||||
<item android:color="#FFF4F4F4" android:offset="1"/>
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
</vector>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<solid android:color="@color/set_default_bottom_sheet_bg_color" />
|
||||
|
||||
<corners android:topLeftRadius="30dp" android:topRightRadius="30dp"/>
|
||||
</shape>
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (c) 2019 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 http://mozilla.org/MPL/2.0/.
|
||||
-->
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle" android:padding="10dp">
|
||||
<solid android:color="@color/set_default_bottom_sheet_button_disable_color"/>
|
||||
<corners android:radius="50dp"/>
|
||||
</shape>
|
||||
@@ -34,25 +34,22 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:text="@string/set_default_browser_title"
|
||||
android:lineSpacingMultiplier="1.2"
|
||||
android:layout_marginStart="32dp"
|
||||
android:layout_marginEnd="32dp"
|
||||
android:layout_marginStart="29dp"
|
||||
android:layout_marginEnd="29dp"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:textSize="24sp"
|
||||
android:textColor="@color/onboarding_text_color"
|
||||
android:textStyle="bold" />
|
||||
android:textColor="@color/set_default_text_color"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:text="@string/set_default_browser_text"
|
||||
android:lineSpacingMultiplier="1.2"
|
||||
android:layout_marginStart="52dp"
|
||||
android:layout_marginEnd="52dp"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@color/onboarding_text_color"/>
|
||||
android:textColor="@color/set_default_text_color"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_set_default_browser"
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (c) 2022 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 http://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="wrap_content"
|
||||
android:paddingTop="31dp"
|
||||
android:paddingStart="22dp"
|
||||
android:paddingEnd="22dp"
|
||||
android:paddingBottom="31dp"
|
||||
android:orientation="vertical"
|
||||
tools:context=".SetDefaultBrowserBottomSheetFragment">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:drawablePadding="15dp"
|
||||
app:drawableStartCompat="@drawable/ic_brave_36"
|
||||
android:text="@string/brave_privacy_set_default_browser"
|
||||
android:textSize="20sp"
|
||||
android:textColor="@color/set_default_text_color"
|
||||
android:textStyle="bold"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="15dp"
|
||||
android:layout_marginStart="54dp"
|
||||
android:textSize="14sp"
|
||||
android:text="@string/brave_choose"
|
||||
android:textColor="@color/set_default_text_color"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginTop="28dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_cancel"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@android:color/transparent"
|
||||
android:textAllCaps="false"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingBottom="8dp"
|
||||
android:paddingStart="35dp"
|
||||
android:paddingEnd="35dp"
|
||||
android:textSize="14sp"
|
||||
android:text="@string/brave_cancel"
|
||||
android:textColor="@color/onboarding_gray"
|
||||
style="?android:attr/borderlessButtonStyle"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_next"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="10dp"
|
||||
android:background="@drawable/orange_rounded_button"
|
||||
app:backgroundTint="@null"
|
||||
android:text="@string/brave_next"
|
||||
android:textAllCaps="false"
|
||||
android:textColor="@android:color/white"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingBottom="8dp"
|
||||
android:paddingStart="35dp"
|
||||
android:paddingEnd="35dp"
|
||||
android:textSize="16sp"
|
||||
style="?android:attr/borderlessButtonStyle"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/checkbox_dont_ask"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:button="@drawable/brave_checkbox"
|
||||
android:layout_marginTop="20dp"
|
||||
android:paddingStart="8dp"
|
||||
android:text="@string/brave_dont_ask_again"
|
||||
android:textSize="14sp"
|
||||
android:textColor="@color/set_default_text_color"/>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -28,6 +28,10 @@
|
||||
<!-- Text colors -->
|
||||
<color name="brave_theme_hint_text">#84889C</color>
|
||||
|
||||
<!-- Set Default Browser colors -->
|
||||
<color name="set_default_bottom_sheet_bg_color">#1E2029</color>
|
||||
<color name="set_default_text_color">#F0F2FF</color>
|
||||
|
||||
<!-- Brave news colors -->
|
||||
<color name="card_background">#F23B3E4F</color>
|
||||
<color name="card_background_solid">#353535</color>
|
||||
|
||||
@@ -42,6 +42,11 @@
|
||||
<color name="onboarding_indicator_selected_color">#FF7654</color>
|
||||
<color name="onboarding_indicator_default_color">#C2C4CF</color>
|
||||
|
||||
<!-- Set Default Browser colors -->
|
||||
<color name="set_default_bottom_sheet_bg_color">@android:color/white</color>
|
||||
<color name="set_default_text_color">#212529</color>
|
||||
<color name="set_default_bottom_sheet_button_disable_color">#DADCE8</color>
|
||||
|
||||
<!-- Sync colors -->
|
||||
<color name="brave_sync_bg_color">@color/modern_grey_50</color>
|
||||
<color name="brave_sync_border_color">@color/modern_grey_50</color>
|
||||
|
||||
@@ -29,6 +29,15 @@
|
||||
<item name="android:background">@drawable/rounded_top_corners</item>
|
||||
</style>
|
||||
|
||||
<style name="AppSetDefaultBottomSheetDialogTheme"
|
||||
parent="Theme.Design.Light.BottomSheetDialog">
|
||||
<item name="bottomSheetStyle">@style/AppModalSetDefaultStyle</item>
|
||||
</style>
|
||||
|
||||
<style name="AppModalSetDefaultStyle" parent="Widget.Design.BottomSheet.Modal">
|
||||
<item name="android:background">@drawable/rounded_set_default_top_corners</item>
|
||||
</style>
|
||||
|
||||
<!-- Buttons for Brave Sync -->
|
||||
<style name="BraveSyncButton">
|
||||
<item name="android:textColor">@android:color/white</item>
|
||||
|
||||
Reference in New Issue
Block a user