Skip to content

Commit

Permalink
Ads fixes:
Browse files Browse the repository at this point in the history 
(1) Font size and background
(2) Fix buttons to use 48dp

Closes brave/brave-browser#12956
  • Loading branch information
@yachtcaptain23
yachtcaptain23 committed Apr 19, 2021
1 parent 319eab0 commit bab3a40
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 32 deletions.
1 change: 1 addition & 0 deletions android/brave_java_resources.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,7 @@ brave_java_resources = [
"java/res/drawable/ac_radio_button_selector.xml",
"java/res/drawable/ac_radio_group_bg.xml",
"java/res/drawable/ac_text_selector.xml",
"java/res/drawable/ads_custom_notification_border.xml",
"java/res/drawable/bat_ads_close_button.xml",
"java/res/drawable/bat_ads_logo_button.xml",
"java/res/drawable/bat_panel_gradient.xml",
Expand Down
5 changes: 5 additions & 0 deletions android/java/res/drawable/ads_custom_notification_border.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
<solid android:color="#edf0f2" />
<stroke android:width="1dip" android:color="#c9d3da"/>
<corners android:radius="4dp"/>
</shape>
89 changes: 58 additions & 31 deletions android/java/res/layout/brave_ads_custom_notification.xml
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#edf0f2"
android:id="@+id/brave_ads_custom_notification_popup">

android:background="@drawable/ads_custom_notification_border"
android:id="@+id/brave_ads_custom_notification_popup"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="2dp"
android:orientation="horizontal"
>
<TextView
android:id="@+id/brave_ads_custom_notification_header"
android:orientation="vertical"
android:paddingEnd="48dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins_medium"
android:textColor="#000000"
android:textSize="12sp"
android:paddingStart="13dp"
android:paddingTop="8dp"/>

<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
android:padding="2dp"
android:orientation="horizontal"
>
<TextView
android:id="@+id/brave_ads_custom_notification_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins_medium"
android:textColor="#000000"
android:textSize="14sp"
android:paddingStart="13dp"
android:paddingTop="8dp"/>

</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="2dp"
android:orientation="horizontal">
<TextView
android:id="@+id/brave_ads_custom_notification_body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins_light"
android:textColor="#000000"
android:paddingEnd="2dp"
android:paddingStart="13dp"
android:layout_marginBottom="7dp"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="48dp"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_gravity="end"
android:layout_gravity="center"
android:src="@drawable/bat_ads_logo_button"
android:paddingTop="2dp"
android:paddingEnd="2dp"
Expand Down Expand Up @@ -59,12 +82,16 @@
<TextView
android:id="@+id/brave_ads_custom_notification_body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins_light"
android:textColor="#000000"
android:paddingEnd="2dp"
android:paddingStart="13dp"
android:layout_marginBottom="7dp"
android:textSize="11sp" />
android:layout_height="48dp"
android:id="@+id/brave_ads_custom_notification_close_button">
<ImageView
android:layout_width="match_parent"
android:layout_height="24dp"
android:layout_gravity="center"
android:padding="4dp"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:src="@drawable/bat_ads_close_button"/>
</FrameLayout>
</LinearLayout>
</LinearLayout>
</RelativeLayout>
5 changes: 4 additions & 1 deletion ...rave_ads/android/java/org/chromium/chrome/browser/dialogs/BraveAdsNotificationDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import android.app.AlertDialog;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
Expand Down Expand Up @@ -61,11 +63,12 @@ public static void displayAdsNotification(Context context, final String notifica
mAdsDialog.setCancelable(false);

window.setAttributes(wlp);
window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));

window.setFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL,
WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);

ImageView closeButton = mAdsDialog.findViewById(R.id.brave_ads_custom_notification_close_button);
View closeButton = mAdsDialog.findViewById(R.id.brave_ads_custom_notification_close_button);

((TextView) mAdsDialog.findViewById(R.id.brave_ads_custom_notification_header)).setText(title);
((TextView) mAdsDialog.findViewById(R.id.brave_ads_custom_notification_body)).setText(body);
Expand Down

0 comments on commit bab3a40

Please sign in to comment.