Skip to content

Commit

Permalink
Merge pull request #8673 from brave/shields-share-layout
Browse files Browse the repository at this point in the history 
[Android] fixes pixelated icons and the shields layout with the share…
  • Loading branch information
@alexsafe
alexsafe authored Apr 29, 2021
2 parents bcd9189 + ec22cee commit c5a792b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions android/java/res/drawable/ic_help.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<vector android:autoMirrored="true" android:height="16dp"
<vector android:autoMirrored="true" android:height="24dp"
android:viewportHeight="24" android:viewportWidth="24"
android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@color/shield_text_color" android:fillType="evenOdd" android:pathData="M10 20C4.48583 20 0 15.5142 0 10C0 4.48583 4.48583 0 10 0C15.5142 0 20 4.48583 20 10C20 15.5142 15.5142 20 10 20ZM10 1.66667C5.405 1.66667 1.66667 5.405 1.66667 10C1.66667 14.595 5.405 18.3333 10 18.3333C14.595 18.3333 18.3333 14.595 18.3333 10C18.3333 5.405 14.595 1.66667 10 1.66667ZM11.9908 10.2867C10.7833 11.2642 10.8283 12.3467 10.8308 12.3917C10.8567 12.8458 10.5133 13.2433 10.06 13.2767C10.0383 13.2783 10.0183 13.2792 9.9975 13.2792C9.57 13.2792 9.20833 12.9592 9.17 12.5267C9.16333 12.4467 9.0175 10.5492 10.9417 8.99083C11.4767 8.55833 11.6667 8.17833 11.6667 7.5425C11.6667 6.57417 10.9192 5.78583 10 5.78583C9.05 5.78583 8.33333 6.5025 8.33333 7.4525C8.33333 7.91333 7.96 8.28583 7.5 8.28583C7.04 8.28583 6.66667 7.91333 6.66667 7.4525C6.66667 5.58417 8.13083 4.12 10 4.12C11.8383 4.12 13.3333 5.655 13.3333 7.5425C13.3333 8.68833 12.9192 9.535 11.9908 10.2867ZM10.1375 14.155C10.5908 14.2333 10.8992 14.6408 10.8208 15.095L10.8133 15.1417C10.7433 15.5467 10.3908 15.8333 9.9925 15.8333C9.94583 15.8333 9.89833 15.8292 9.85 15.8208C9.39667 15.7425 9.0925 15.3117 9.17083 14.8583C9.24917 14.405 9.68167 14.0758 10.1375 14.155Z"/>
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@color/shield_text_color" android:fillType="evenOdd" android:scaleType="centerInside" android:pathData="M12 24C5.383 24 0 18.617 0 12C0 5.383 5.383 0 12 0C18.617 0 24 5.383 24 12C24 18.617 18.617 24 12 24ZM12 2C6.486 2 2 6.486 2 12C2 17.514 6.486 22 12 22C17.514 22 22 17.514 22 12C22 6.486 17.514 2 12 2ZM14.389 12.344C12.94 13.517 12.994 14.816 12.997 14.87C13.028 15.415 12.616 15.892 12.072 15.932C12.046 15.934 12.022 15.935 11.997 15.935C11.484 15.935 11.05 15.551 11.004 15.032C10.996 14.936 10.821 12.659 13.13 10.789C13.772 10.27 14 9.814 14 9.051C14 7.889 13.103 6.943 12 6.943C10.86 6.943 10 7.803 10 8.943C10 9.496 9.552 9.943 9 9.943C8.448 9.943 8 9.496 8 8.943C8 6.701 9.757 4.944 12 4.944C14.206 4.944 16 6.786 16 9.051C16 10.426 15.503 11.442 14.389 12.344ZM12.165 16.986C12.709 17.08 13.079 17.569 12.985 18.114L12.976 18.17C12.892 18.656 12.469 19 11.991 19C11.935 19 11.878 18.995 11.82 18.985C11.276 18.891 10.911 18.374 11.005 17.83C11.099 17.286 11.618 16.891 12.165 16.986Z"/>
</vector>
6 changes: 3 additions & 3 deletions android/java/res/drawable/ic_share.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<vector android:autoMirrored="true" android:height="16dp"
<vector android:autoMirrored="true" android:height="24dp"
android:viewportHeight="24" android:viewportWidth="24"
android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@color/shield_text_color" android:fillType="evenOdd" android:pathData="M16.6667 6.66667C15.6567 6.66667 14.7617 6.20583 14.1492 5.49417L6.58333 9.27833C6.635 9.51083 6.66667 9.75 6.66667 9.99833C6.66667 10.2233 6.64333 10.4433 6.6 10.6567L14.1533 14.5008C14.765 13.7925 15.6592 13.3333 16.6667 13.3333C18.505 13.3333 20 14.8283 20 16.6667C20 18.505 18.505 20 16.6667 20C14.8283 20 13.3333 18.505 13.3333 16.6667C13.3333 16.435 13.3575 16.2083 13.4025 15.99L5.85917 12.15C5.24667 12.8675 4.34833 13.3333 3.33333 13.3333C1.495 13.3333 0 11.8375 0 9.99833C0 8.16 1.495 6.665 3.33333 6.665C4.325 6.665 5.20667 7.10833 5.8175 7.7975L13.4017 4.005C13.3567 3.7875 13.3333 3.56333 13.3333 3.33333C13.3333 1.495 14.8283 0 16.6667 0C18.505 0 20 1.495 20 3.33333C20 5.17167 18.505 6.66667 16.6667 6.66667ZM16.6667 18.3333C17.5858 18.3333 18.3333 17.585 18.3333 16.6667C18.3333 15.7475 17.5858 15 16.6667 15C15.7483 15 15 15.7475 15 16.6667C15 17.585 15.7483 18.3333 16.6667 18.3333ZM3.33333 8.33167C2.415 8.33167 1.66667 9.08 1.66667 9.99833C1.66667 10.9175 2.415 11.6667 3.33333 11.6667C4.2525 11.6667 5 10.9175 5 9.99833C5 9.08 4.2525 8.33167 3.33333 8.33167ZM16.6667 1.66667C15.7483 1.66667 15 2.415 15 3.33333C15 4.2525 15.7483 5 16.6667 5C17.5858 5 18.3333 4.2525 18.3333 3.33333C18.3333 2.415 17.5858 1.66667 16.6667 1.66667Z"/>
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@color/shield_text_color" android:fillType="evenOdd" android:scaleType="centerInside" android:pathData="M20 8C18.788 8 17.714 7.447 16.979 6.593L7.9 11.134C7.962 11.413 8 11.7 8 11.998C8 12.268 7.972 12.532 7.92 12.788L16.984 17.401C17.718 16.551 18.791 16 20 16C22.206 16 24 17.794 24 20C24 22.206 22.206 24 20 24C17.794 24 16 22.206 16 20C16 19.722 16.029 19.45 16.083 19.188L7.031 14.58C6.296 15.441 5.218 16 4 16C1.794 16 0 14.205 0 11.998C0 9.792 1.794 7.998 4 7.998C5.19 7.998 6.248 8.53 6.981 9.357L16.082 4.806C16.028 4.545 16 4.276 16 4C16 1.794 17.794 0 20 0C22.206 0 24 1.794 24 4C24 6.206 22.206 8 20 8ZM20 22C21.103 22 22 21.102 22 20C22 18.897 21.103 18 20 18C18.898 18 18 18.897 18 20C18 21.102 18.898 22 20 22ZM4 9.998C2.898 9.998 2 10.896 2 11.998C2 13.101 2.898 14 4 14C5.103 14 6 13.101 6 11.998C6 10.896 5.103 9.998 4 9.998ZM20 2C18.898 2 18 2.898 18 4C18 5.103 18.898 6 20 6C21.103 6 22 5.103 22 4C22 2.898 21.103 2 20 2Z"/>
</vector>
16 changes: 8 additions & 8 deletions android/java/res/layout/brave_shields_main_layout.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:weightSum="4"
android:weightSum="5"
android:orientation="horizontal">

<TextView
Expand All @@ -126,6 +126,7 @@
android:textSize="34sp"
android:textStyle="bold"
android:layout_marginEnd="16dp"
android:gravity="center"
android:layout_weight="1"
android:fontFamily="sans-serif"
app:autoSizeMaxTextSize="34sp"
Expand All @@ -138,26 +139,25 @@
android:id="@+id/site_block_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="13sp"
android:gravity="center"
android:layout_weight="1"
android:text="@string/ads_and_other_things_blocked"
android:textSize="12sp"
android:gravity="center"
android:layout_weight="2"
android:text="@string/ads_and_other_things_blocked"
android:layout_gravity="center_vertical"
android:textColor="@color/shield_title_color"/>

<ImageView
android:id="@+id/help"
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_height="24dp"
android:layout_weight="1"
android:src="@drawable/ic_help"
/>

<ImageView
android:id="@+id/share"
android:layout_width="0dp"
android:layout_height="30dp"

android:layout_height="24dp"
android:layout_weight="1"
android:src="@drawable/ic_share"
/>
Expand Down

0 comments on commit c5a792b

Please sign in to comment.