Skip to content

Commit

Permalink
[Android] re-do last commit
Browse files Browse the repository at this point in the history
  • Loading branch information
alexsafe committed May 22, 2021
1 parent 7aed8de commit 98bd43e
Show file tree
Hide file tree
Showing 7 changed files with 257 additions and 59 deletions.
4 changes: 4 additions & 0 deletions android/brave_java_resources.gni
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,10 @@ brave_java_resources = [
"java/res/font/poppins_light.ttf",
"java/res/font/poppins_medium.ttf",
"java/res/layout-land/brave_rewards_site_banner.xml",
"java/res/layout-land/brave_shields_stats_row.xml",
"java/res/layout-land/verify_wallet_activity.xml",
"java/res/layout-sw600dp-land/brave_shields_stats_row.xml",
"java/res/layout-sw600dp/brave_shields_stats_row.xml",
"java/res/layout/activity_ntp_widget_stack.xml",
"java/res/layout/activity_onboarding.xml",
"java/res/layout/activity_p3a_onboarding.xml",
Expand Down Expand Up @@ -714,6 +717,7 @@ brave_java_resources = [
"java/res/layout/brave_shields_main_layout.xml",
"java/res/layout/brave_shields_option_layout.xml",
"java/res/layout/brave_shields_secondary_layout.xml",
"java/res/layout/brave_shields_stats_row.xml",
"java/res/layout/brave_shields_switcher.xml",
"java/res/layout/brave_shields_thank_you_layout.xml",
"java/res/layout/brave_shields_toggle_layout.xml",
Expand Down
62 changes: 62 additions & 0 deletions android/java/res/layout-land/brave_shields_stats_row.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2021 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"
android:id="@+id/site_block_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical|center_horizontal"
android:layout_marginTop="16dp"
android:layout_marginEnd="20dp"
android:layout_marginStart="20dp"
android:weightSum="6"
android:orientation="horizontal">

<TextView
android:id="@+id/site_block_count_text"
android:layout_width="0dp"
android:layout_height="40dp"
android:textSize="34sp"
android:textStyle="bold"
android:layout_marginEnd="16dp"
android:gravity="center"
android:layout_weight="1"
android:fontFamily="sans-serif"
app:autoSizeMaxTextSize="34sp"
app:autoSizeMinTextSize="12sp"
app:autoSizeStepGranularity="2sp"
app:autoSizeTextType="uniform"
android:textColor="@color/shield_title_color"/>

<TextView
android:id="@+id/site_block_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="12sp"
android:gravity="center"
android:layout_weight="3"
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="24dp"
android:layout_weight="1"
android:contentDescription="@null"
android:src="@drawable/ic_help"/>

<ImageView
android:id="@+id/share"
android:layout_width="0dp"
android:layout_height="24dp"
android:layout_weight="1"
android:src="@drawable/ic_share"
android:contentDescription="@null"/>

</LinearLayout>
62 changes: 62 additions & 0 deletions android/java/res/layout-sw600dp-land/brave_shields_stats_row.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2021 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"
android:id="@+id/site_block_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical|center_horizontal"
android:layout_marginTop="16dp"
android:layout_marginEnd="90dp"
android:layout_marginStart="90dp"
android:weightSum="6"
android:orientation="horizontal">

<TextView
android:id="@+id/site_block_count_text"
android:layout_width="0dp"
android:layout_height="40dp"
android:textSize="34sp"
android:textStyle="bold"
android:layout_marginEnd="16dp"
android:gravity="center"
android:layout_weight="1"
android:fontFamily="sans-serif"
app:autoSizeMaxTextSize="34sp"
app:autoSizeMinTextSize="12sp"
app:autoSizeStepGranularity="2sp"
app:autoSizeTextType="uniform"
android:textColor="@color/shield_title_color"/>

<TextView
android:id="@+id/site_block_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="12sp"
android:gravity="center"
android:layout_weight="3"
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="24dp"
android:layout_weight="1"
android:src="@drawable/ic_help"
android:contentDescription="@null"/>

<ImageView
android:id="@+id/share"
android:layout_width="0dp"
android:layout_height="24dp"
android:layout_weight="1"
android:src="@drawable/ic_share"
android:contentDescription="@null"/>

</LinearLayout>
62 changes: 62 additions & 0 deletions android/java/res/layout-sw600dp/brave_shields_stats_row.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2021 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"
android:id="@+id/site_block_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical|center_horizontal"
android:layout_marginTop="16dp"
android:layout_marginEnd="70dp"
android:layout_marginStart="70dp"
android:weightSum="6"
android:orientation="horizontal">

<TextView
android:id="@+id/site_block_count_text"
android:layout_width="0dp"
android:layout_height="40dp"
android:textSize="34sp"
android:textStyle="bold"
android:layout_marginEnd="16dp"
android:gravity="center"
android:layout_weight="1"
android:fontFamily="sans-serif"
app:autoSizeMaxTextSize="34sp"
app:autoSizeMinTextSize="12sp"
app:autoSizeStepGranularity="2sp"
app:autoSizeTextType="uniform"
android:textColor="@color/shield_title_color"/>

<TextView
android:id="@+id/site_block_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="12sp"
android:gravity="center"
android:layout_weight="3"
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="24dp"
android:layout_weight="1"
android:src="@drawable/ic_help"
android:contentDescription="@null"/>

<ImageView
android:id="@+id/share"
android:layout_width="0dp"
android:layout_height="24dp"
android:layout_weight="1"
android:src="@drawable/ic_share"
android:contentDescription="@null" />

</LinearLayout>
62 changes: 4 additions & 58 deletions android/java/res/layout/brave_shields_main_layout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,67 +108,13 @@
android:visibility="gone"
android:textColor="@color/default_icon_color_tint_list"/>

<LinearLayout
android:id="@+id/site_block_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:weightSum="5"
android:orientation="horizontal">

<TextView
android:id="@+id/site_block_count_text"
android:layout_width="0dp"
android:layout_height="40dp"
android:textSize="34sp"
android:textStyle="bold"
android:layout_marginEnd="16dp"
android:gravity="center"
android:layout_weight="1"
android:fontFamily="sans-serif"
app:autoSizeMaxTextSize="34sp"
app:autoSizeMinTextSize="12sp"
app:autoSizeStepGranularity="2sp"
app:autoSizeTextType="uniform"
android:textColor="@color/shield_title_color"/>

<TextView
android:id="@+id/site_block_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
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="24dp"
android:layout_weight="1"
android:contentDescription="@null"
android:src="@drawable/ic_help"
/>

<ImageView
android:id="@+id/share"
android:layout_width="0dp"
android:layout_height="24dp"
android:layout_weight="1"
android:contentDescription="@null"
android:src="@drawable/ic_share"
/>

</LinearLayout>
<include
android:id="@+id/site_block_layout"
layout="@layout/brave_shields_stats_row"/>

<TextView
android:id="@+id/site_broken_warning_text"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:gravity="center_horizontal"
Expand Down
62 changes: 62 additions & 0 deletions android/java/res/layout/brave_shields_stats_row.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2021 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"
android:id="@+id/site_block_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical|center_horizontal"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:weightSum="5"
android:orientation="horizontal">

<TextView
android:id="@+id/site_block_count_text"
android:layout_width="0dp"
android:layout_height="40dp"
android:textSize="34sp"
android:textStyle="bold"
android:layout_marginEnd="16dp"
android:gravity="center"
android:layout_weight="1"
android:fontFamily="sans-serif"
app:autoSizeMaxTextSize="34sp"
app:autoSizeMinTextSize="12sp"
app:autoSizeStepGranularity="2sp"
app:autoSizeTextType="uniform"
android:textColor="@color/shield_title_color"/>

<TextView
android:id="@+id/site_block_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
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="24dp"
android:layout_weight="1"
android:src="@drawable/ic_help"
android:contentDescription="@null"/>

<ImageView
android:id="@+id/share"
android:layout_width="0dp"
android:layout_height="24dp"
android:layout_weight="1"
android:src="@drawable/ic_share"
android:contentDescription="@null"/>

</LinearLayout>
2 changes: 1 addition & 1 deletion browser/ui/android/strings/android_brave_strings.grd
Original file line number Diff line number Diff line change
Expand Up @@ -1145,7 +1145,7 @@ until they verify, or until 90 days have passed.
Share the news
</message>
<message name="IDS_BRAVE_STATS_SHARE_TEXT" desc="Text sent when sharing the stats">
Every day I save data by browsing the web with Brave.
Every day I save data by browsing the Web with Brave.
</message>
<message name="IDS_BRAVE_STATS_SHARE_TOOLTIP_TIER1_TITLE" desc="Shields tootltip title">
1000 trackers &amp; ads blocked!
Expand Down

0 comments on commit 98bd43e

Please sign in to comment.