blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #982 - Adds icon and button for privacy notice onboarding card

master
Jeff Boek 2019-05-20 13:18:01 -07:00
parent 591f367806
commit 02db8279fb
3 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/res/drawable/ic_onboarding_privacy_notice.xml 100644
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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/. -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,22C6.4772,22 2,17.5228 2,12C2,6.4772 6.4772,2 12,2C17.5228,2 22,6.4772 22,12C21.9939,17.5203 17.5203,21.9939 12,22ZM12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20C16.4183,20 20,16.4183 20,12C19.995,7.5838 16.4162,4.005 12,4ZM12,11C12.5523,11 13,11.4477 13,12L13,16C13,16.5523 12.5523,17 12,17C11.4477,17 11,16.5523 11,16L11,12C11,11.4477 11.4477,11 12,11ZM12,7C12.5523,7 13,7.4477 13,8C13,8.5523 12.5523,9 12,9C11.4477,9 11,8.5523 11,8C11,7.4477 11.4477,7 12,7Z"
android:strokeWidth="1"
android:fillType="evenOdd"
android:strokeColor="#00000000">
<aapt:attr name="android:fillColor">
<gradient
android:startY="3.2727787"
android:startX="22.576483"
android:endY="15.679591"
android:endX="6.9187684"
android:type="linear">
<item android:offset="0" android:color="#FF6A11CB"/>
<item android:offset="1" android:color="#FF2575FC"/>
</gradient>
</aapt:attr>
</path>
</vector>

25
app/src/main/res/layout/onboarding_privacy_notice.xml
View File

@ -11,6 +11,8 @@
android:orientation="vertical">
<TextView
android:id="@+id/header_text"
android:drawableStart="@drawable/ic_onboarding_privacy_notice"
android:drawablePadding="12dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="14dp"
@ -22,4 +24,27 @@
android:layout_height="wrap_content"
android:text="@string/onboarding_privacy_notice_description"
android:textAppearance="@style/Body14TextStyle" />
<FrameLayout
android:id="@+id/read_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/button_background"
android:backgroundTint="?shadow"
android:clickable="true"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground"
android:padding="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:clickable="false"
android:focusable="false"
android:textStyle="bold"
android:gravity="center"
android:text="@string/onboarding_privacy_notice_read_button"
android:textColor="?primaryText"
android:textSize="14sp" />
</FrameLayout>
</LinearLayout>

1
app/src/main/res/values/strings.xml
View File

@ -496,4 +496,5 @@
<string name="accessibility_text_size_sample_text">The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.</string>
<string name="preference_accessibility_text_size_summary">Make text on websites larger or smaller</string>
<string name="preference_accessibility_font_size_title">Font Size</string>
<string name="onboarding_privacy_notice_read_button">Read our privacy notice</string>
</resources>