Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-19 09:25:34 +00:00
Code Issues Releases Wiki Activity

[fenix] For https://github.com/mozilla-mobile/fenix/issues/6317 - Applies 3dot menuItem look to quickSettings and tracking panel

Browse Source
This commit is contained in:
codrut.topliceanu 2020-02-11 12:51:59 +02:00 committed by Emily Kager
parent df36b981bb
commit 05bbd9b5a5
3 changed files with 47 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/res/layout/component_tracking_protection_panel.xml
View File

@ -54,7 +54,7 @@
<TextView <TextView
android:id="@+id/cross_site_tracking" android:id="@+id/cross_site_tracking"
style="@style/QuickSettingsText.Icon" style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height" android:layout_height="@dimen/tracking_protection_item_height"
android:text="@string/etp_cookies_title" android:text="@string/etp_cookies_title"
@ -64,7 +64,7 @@
<TextView <TextView
android:id="@+id/fingerprinters" android:id="@+id/fingerprinters"
style="@style/QuickSettingsText.Icon" style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height" android:layout_height="@dimen/tracking_protection_item_height"
android:text="@string/etp_fingerprinters_title" android:text="@string/etp_fingerprinters_title"
@ -74,7 +74,7 @@
<TextView <TextView
android:id="@+id/cryptominers" android:id="@+id/cryptominers"
style="@style/QuickSettingsText.Icon" style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height" android:layout_height="@dimen/tracking_protection_item_height"
android:text="@string/etp_cryptominers_title" android:text="@string/etp_cryptominers_title"
@ -84,7 +84,7 @@
<TextView <TextView
android:id="@+id/social_media_trackers" android:id="@+id/social_media_trackers"
style="@style/QuickSettingsText.Icon" style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height" android:layout_height="@dimen/tracking_protection_item_height"
android:text="@string/etp_social_media_trackers_title" android:text="@string/etp_social_media_trackers_title"
@ -94,7 +94,7 @@
<TextView <TextView
android:id="@+id/tracking_content" android:id="@+id/tracking_content"
style="@style/QuickSettingsText.Icon" style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height" android:layout_height="@dimen/tracking_protection_item_height"
android:text="@string/etp_tracking_content_title" android:text="@string/etp_tracking_content_title"
@ -115,7 +115,7 @@
<TextView <TextView
android:id="@+id/fingerprinters_loaded" android:id="@+id/fingerprinters_loaded"
style="@style/QuickSettingsText.Icon" style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height" android:layout_height="@dimen/tracking_protection_item_height"
android:text="@string/etp_fingerprinters_title" android:text="@string/etp_fingerprinters_title"
@ -125,7 +125,7 @@
<TextView <TextView
android:id="@+id/cryptominers_loaded" android:id="@+id/cryptominers_loaded"
style="@style/QuickSettingsText.Icon" style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height" android:layout_height="@dimen/tracking_protection_item_height"
android:text="@string/etp_cryptominers_title" android:text="@string/etp_cryptominers_title"
@ -135,7 +135,7 @@
<TextView <TextView
android:id="@+id/social_media_trackers_loaded" android:id="@+id/social_media_trackers_loaded"
style="@style/QuickSettingsText.Icon" style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height" android:layout_height="@dimen/tracking_protection_item_height"
android:text="@string/etp_social_media_trackers_title" android:text="@string/etp_social_media_trackers_title"
@ -145,7 +145,7 @@
<TextView <TextView
android:id="@+id/tracking_content_loaded" android:id="@+id/tracking_content_loaded"
style="@style/QuickSettingsText.Icon" style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height" android:layout_height="@dimen/tracking_protection_item_height"
android:text="@string/etp_tracking_content_title" android:text="@string/etp_tracking_content_title"
@ -162,7 +162,7 @@
<TextView <TextView
android:id="@+id/protection_settings" android:id="@+id/protection_settings"
style="@style/QuickSettingsText.Icon" style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height" android:layout_height="@dimen/tracking_protection_item_height"
android:paddingEnd="24dp" android:paddingEnd="24dp"
@ -188,6 +188,7 @@
app:layout_constraintBottom_toBottomOf="@+id/category_description" app:layout_constraintBottom_toBottomOf="@+id/category_description"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/category_title" app:layout_constraintTop_toTopOf="@id/category_title"
app:layout_constraintVertical_bias="0.0"
app:srcCompat="@drawable/mozac_ic_back" /> app:srcCompat="@drawable/mozac_ic_back" />
<TextView <TextView
@ -253,6 +254,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="52dp" android:layout_marginStart="52dp"
android:layout_marginEnd="26dp" android:layout_marginEnd="26dp"
android:lineSpacingMultiplier="1.2"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
tools:text="@tools:sample/lorem/random" /> tools:text="@tools:sample/lorem/random" />
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>

36
app/src/main/res/layout/quicksettings_website_info.xml
View File

@ -12,26 +12,34 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<TextView <LinearLayout
android:id="@+id/title"
style="@style/QuickSettingsText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp" android:orientation="vertical"
android:textStyle="bold" android:minHeight="@dimen/tracking_protection_item_height">
tools:text="Wikipedia" />
<TextView <TextView
android:id="@+id/url" android:id="@+id/title"
style="@style/QuickSettingsText" style="@style/QuickSettingsText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp" android:paddingTop="8dp"
tools:text="https://wikipedia.org" /> android:textStyle="bold"
tools:text="Wikipedia" />
<TextView
android:id="@+id/url"
style="@style/QuickSettingsText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
tools:text="https://wikipedia.org" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="@dimen/tracking_protection_item_height"
android:orientation="horizontal" android:orientation="horizontal"
style="@style/QuickSettingsText" style="@style/QuickSettingsText"
android:paddingTop="8dp" android:paddingTop="8dp"
@ -49,7 +57,7 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/securityInfo" android:id="@+id/securityInfo"
style="@style/QuickSettingsText" style="@style/QuickSettingsLargeText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:paddingStart="0dp" android:paddingStart="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

13
app/src/main/res/values/styles.xml
View File

@ -318,6 +318,19 @@
<item name="android:layout_alignParentStart">true</item> <item name="android:layout_alignParentStart">true</item>
</style> </style>
<style name="QuickSettingsLargeText">
<item name="android:textColor">@color/state_list_text_color</item>
<item name="android:textSize">16sp</item>
<item name="android:paddingStart">16dp</item>
<item name="android:paddingEnd">16dp</item>
<item name="android:gravity">center_vertical</item>
<item name="android:layout_alignParentStart">true</item>
</style>
<style name="QuickSettingsLargeText.Icon">
<item name="android:drawablePadding">8dp</item>
</style>
<style name="QuickSettingsText.Icon"> <style name="QuickSettingsText.Icon">
<item name="android:drawablePadding">8dp</item> <item name="android:drawablePadding">8dp</item>
</style> </style>