Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add poppins font

Browse Source 
Update rewards panel UI
This commit is contained in:
Deep
2021-12-21 02:50:46 -05:00
parent ceaf3816fa
commit 28cd4a5ab7
16 changed files with 86 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/res/font/poppins_regular.ttf
BIN
View File
Binary file not shown.
android/java/res/layout/brave_rewards_onboarding_layout.xml
+5
View File
@@ -12,6 +12,7 @@
android:layout_margin="4dp"
android:gravity="center"
android:visibility="gone"
android:layout_gravity="center_horizontal"
app:cardBackgroundColor="@color/rewards_panel_card_bg_color"
app:cardElevation="10dp"
app:cardUseCompatPadding="true"
@@ -66,6 +67,7 @@
android:drawablePadding="4dp"
android:drawableTint="@color/rewards_panel_action_color"
android:focusable="true"
android:fontFamily="@font/poppins_regular"
android:text="@string/lets_take_a_quick_tour"
android:textColor="@color/rewards_panel_action_color" />
@@ -78,6 +80,7 @@
android:clickable="true"
android:focusable="true"
android:text="@string/skip"
android:fontFamily="@font/poppins_regular"
android:textColor="@color/rewards_panel_secondary_text_color" />
</LinearLayout>
@@ -100,6 +103,7 @@
android:drawablePadding="4dp"
android:drawableTint="@color/rewards_panel_secondary_text_color"
android:focusable="true"
android:fontFamily="@font/poppins_regular"
android:text="@string/go_back"
android:textColor="@color/rewards_panel_secondary_text_color" />
@@ -119,6 +123,7 @@
android:drawablePadding="4dp"
android:drawableTint="@color/rewards_panel_action_color"
android:focusable="true"
android:fontFamily="@font/poppins_regular"
android:text="@string/next"
android:textColor="@color/rewards_panel_action_color" />
android/java/res/layout/brave_rewards_onboarding_modal.xml
+8 -18
View File
@@ -10,17 +10,13 @@
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:gravity="center"
android:layout_gravity="center_horizontal"
app:cardBackgroundColor="@color/rewards_panel_card_bg_color"
android:visibility="gone"
app:cardElevation="10dp"
app:cardUseCompatPadding="true"
app:cardCornerRadius="12dp">
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -40,6 +36,7 @@
android:layout_marginBottom="8dp"
app:drawableStartCompat="@drawable/btn_bat"
android:drawablePadding="8dp"
android:fontFamily="@font/poppins_regular"
android:text="@string/earn_tokens_and_give_back"
android:textSize="20sp"
android:textStyle="bold"
@@ -53,6 +50,7 @@
android:gravity="center"
android:text="@string/brave_rewards_modal_text"
android:textSize="14sp"
android:fontFamily="@font/poppins_regular"
android:textColor="@color/rewards_panel_secondary_text_color"/>
<TextView
@@ -64,19 +62,21 @@
android:text="@string/take_quick_tour"
android:textSize="14sp"
android:textStyle="bold"
android:fontFamily="@font/poppins_regular"
android:textColor="@color/rewards_panel_action_color"/>
<android.widget.Button
<TextView
android:id="@+id/btn_brave_rewards"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:background="@drawable/blue_rounded_button"
android:background="@drawable/blue_48_rounded_bg"
android:text="@string/start_using_brave_rewards"
android:textAllCaps="false"
android:textSize="16sp"
android:padding="8dp"
android:fontFamily="@font/poppins_regular"
android:layout_marginBottom="20dp"
android:textColor="@android:color/white"
style="?android:attr/borderlessButtonStyle"/>
@@ -91,21 +91,11 @@
android:text="@string/brave_rewards_tos_text"
android:textSize="12sp"
android:textStyle="bold"
android:fontFamily="@font/poppins_regular"
android:textColor="@color/rewards_panel_text_color"/>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/brave_rewards_onboarding_modal_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:layout_gravity="end|top"
android:padding="16dp"
android:src="@drawable/btn_close"/>
</FrameLayout>
</androidx.cardview.widget.CardView>
android/java/res/layout/brave_rewards_panel_layout.xml
+1 -1
View File
@@ -37,7 +37,7 @@
android:orientation="vertical">
<androidx.cardview.widget.CardView
android:layout_width="300dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginStart="12dp"
android/java/res/layout/brave_rewards_panel_notification_layout.xml
+7 -3
View File
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="300dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp"
android:layout_marginBottom="16dp"
android:layout_gravity="bottom"
app:cardBackgroundColor="@color/rewards_panel_card_bg_color"
android:visibility="gone"
app:contentPadding="8dp"
app:cardCornerRadius="16dp"
app:cardElevation="5dp">
app:cardElevation="2dp">
<LinearLayout
android:layout_width="match_parent"
@@ -35,6 +35,7 @@
android:paddingBottom="4dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:fontFamily="@font/poppins_regular"
app:drawableStartCompat="@drawable/ic_calendar" />
<ImageView
@@ -56,6 +57,7 @@
android:textColor="@color/rewards_panel_text_color"
android:drawablePadding="4dp"
android:layout_marginBottom="8dp"
android:fontFamily="@font/poppins_regular"
android:layout_gravity="center_horizontal" />
<TextView
@@ -65,6 +67,7 @@
android:textSize="14sp"
android:textColor="@color/rewards_panel_secondary_text_color"
android:layout_marginBottom="16dp"
android:fontFamily="@font/poppins_regular"
android:layout_gravity="center_horizontal" />
<FrameLayout
@@ -81,6 +84,7 @@
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:fontFamily="@font/poppins_regular"
android:textColor="@android:color/white" />
<ProgressBar
android/java/res/layout/brave_rewards_panel_publisher_layout.xml
+3 -2
View File
@@ -42,6 +42,7 @@
android:ellipsize="end"
android:gravity="start"
android:maxLines="1"
android:fontFamily="@font/poppins_regular"
android:layout_marginBottom="8dp"
android:textColor="@color/rewards_panel_text_color"
android:textSize="20sp" />
@@ -53,12 +54,12 @@
android:layout_gravity="start|center"
android:layout_marginBottom="4dp"
android:drawablePadding="8dp"
android:fontFamily="sans-serif"
android:gravity="start"
android:text="@string/unverified_creator"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:paddingTop="4dp"
android:fontFamily="@font/poppins_regular"
android:paddingBottom="4dp"
android:background="@drawable/unverified_48_rounded_bg"
android:textColor="@color/rewards_panel_text_color"
@@ -79,7 +80,7 @@
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:fontFamily="sans-serif"
android:fontFamily="@font/poppins_regular"
android:text="@string/refresh_status"
android:textColor="@color/rewards_panel_refresh_button_color"
android:layout_marginEnd="4dp"
android/java/res/layout/brave_rewards_panel_settings_layout.xml
+3 -3
View File
@@ -9,7 +9,7 @@
android:layout_marginBottom="16dp"
app:cardBackgroundColor="@color/rewards_panel_card_bg_color"
app:cardCornerRadius="16dp"
app:cardElevation="5dp">
app:cardElevation="2dp">
<LinearLayout
android:layout_width="match_parent"
@@ -41,7 +41,7 @@
android:layout_height="wrap_content"
android:text="@string/tip"
android:textAllCaps="false"
android:textColor="@color/settings_section_text_light_color"
android:fontFamily="@font/poppins_regular"
android:textSize="16sp"/>
</LinearLayout>
@@ -71,7 +71,7 @@
android:layout_height="wrap_content"
android:text="@string/summary"
android:textAllCaps="false"
android:textColor="@color/settings_section_text_light_color"
android:fontFamily="@font/poppins_regular"
android:textSize="16sp"/>
</LinearLayout>
android/java/res/layout/brave_rewards_panel_summary_layout.xml
+20 -34
View File
@@ -21,6 +21,7 @@
android:paddingEnd="16dp"
android:paddingBottom="8dp"
android:text="@string/add_funds"
android:fontFamily="@font/poppins_regular"
android:visibility="gone"
android:foreground="?android:attr/selectableItemBackground"
android:clickable="true"
@@ -43,6 +44,8 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:textStyle="bold"
android:fontFamily="@font/poppins_regular"
android:text="@string/rewards_summary"
android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -51,7 +54,9 @@
android:id="@+id/month_year_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins_regular"
android:textColor="@android:color/white"
android:textStyle="bold"
android:textSize="14sp" />
</LinearLayout>
@@ -62,25 +67,6 @@
android:background="@drawable/rounded_8_bottom_bg"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/history"
android:textColor="@color/rewards_panel_text_color"
android:textSize="14sp" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="@color/rewards_panel_summary_divider_color" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -95,7 +81,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_weight="0.5"
android:fontFamily="sans-serif"
android:fontFamily="@font/poppins_regular"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/total_grants_claimed"
@@ -108,7 +94,7 @@
android:layout_height="wrap_content"
android:layout_weight="0.25"
android:layout_marginEnd="4dp"
android:fontFamily="sans-serif"
android:fontFamily="@font/poppins_regular"
android:textSize="14sp" />
<TextView
@@ -116,7 +102,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.25"
android:fontFamily="sans-serif"
android:fontFamily="@font/poppins_regular"
android:textColor="@color/rewards_panel_secondary_text_color"
android:textSize="12sp" />
@@ -143,7 +129,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_weight="0.5"
android:fontFamily="sans-serif"
android:fontFamily="@font/poppins_regular"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/rewards_from_ads"
@@ -156,7 +142,7 @@
android:layout_height="wrap_content"
android:layout_weight="0.25"
android:layout_marginEnd="4dp"
android:fontFamily="sans-serif"
android:fontFamily="@font/poppins_regular"
android:textSize="14sp" />
<TextView
@@ -164,7 +150,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.25"
android:fontFamily="sans-serif"
android:fontFamily="@font/poppins_regular"
android:textColor="@color/rewards_panel_secondary_text_color"
android:textSize="12sp" />
@@ -193,7 +179,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_weight="0.5"
android:fontFamily="sans-serif"
android:fontFamily="@font/poppins_regular"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/auto_contribute"
@@ -206,7 +192,7 @@
android:layout_height="wrap_content"
android:layout_weight="0.25"
android:layout_marginEnd="4dp"
android:fontFamily="sans-serif"
android:fontFamily="@font/poppins_regular"
android:textColor="@color/rewards_settings_button_color"
android:textSize="14sp" />
@@ -215,7 +201,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.25"
android:fontFamily="sans-serif"
android:fontFamily="@font/poppins_regular"
android:textColor="@color/rewards_panel_secondary_text_color"
android:textSize="12sp" />
@@ -242,7 +228,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_weight="0.5"
android:fontFamily="sans-serif"
android:fontFamily="@font/poppins_regular"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/one_time_tip"
@@ -255,7 +241,7 @@
android:layout_height="wrap_content"
android:layout_weight="0.25"
android:layout_marginEnd="4dp"
android:fontFamily="sans-serif"
android:fontFamily="@font/poppins_regular"
android:textColor="@color/rewards_settings_button_color"
android:textSize="14sp" />
@@ -264,7 +250,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.25"
android:fontFamily="sans-serif"
android:fontFamily="@font/poppins_regular"
android:textColor="@color/rewards_panel_secondary_text_color"
android:textSize="12sp" />
@@ -291,7 +277,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_weight="0.5"
android:fontFamily="sans-serif"
android:fontFamily="@font/poppins_regular"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/monthly_tips"
@@ -304,7 +290,7 @@
android:layout_height="wrap_content"
android:layout_weight="0.25"
android:layout_marginEnd="4dp"
android:fontFamily="sans-serif"
android:fontFamily="@font/poppins_regular"
android:textColor="@color/rewards_settings_button_color"
android:textSize="14sp" />
@@ -313,7 +299,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.25"
android:fontFamily="sans-serif"
android:fontFamily="@font/poppins_regular"
android:textColor="@color/rewards_panel_secondary_text_color"
android:textSize="12sp" />
android/java/res/layout/brave_rewards_panel_tip_layout.xml
+9 -3
View File
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="300dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="8dp"
android:layout_marginBottom="16dp"
app:cardBackgroundColor="@color/rewards_panel_card_bg_color"
app:cardCornerRadius="16dp"
app:cardElevation="5dp">
app:cardElevation="2dp">
<LinearLayout
android:layout_width="match_parent"
@@ -34,6 +34,7 @@
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:text="@string/attention"
android:fontFamily="@font/poppins_regular"
android:textColor="@color/rewards_panel_text_color"
android:textSize="16sp" />
@@ -42,6 +43,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:fontFamily="@font/poppins_regular"
android:textColor="@color/rewards_panel_text_color"
android:textSize="16sp" />
@@ -67,6 +69,7 @@
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:text="@string/include_auto_contribute"
android:fontFamily="@font/poppins_regular"
android:textColor="@color/rewards_panel_secondary_text_color"
android:textSize="16sp" />
@@ -92,6 +95,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:fontFamily="@font/poppins_regular"
android:text="@string/monthly_contribution"
android:textColor="@color/rewards_panel_secondary_text_color"
android:textSize="16sp" />
@@ -102,6 +106,7 @@
android:layout_height="wrap_content"
android:padding="8dp"
android:text="@string/set"
android:fontFamily="@font/poppins_regular"
android:textColor="@color/rewards_panel_action_color"
android:textSize="16sp" />
@@ -124,6 +129,7 @@
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center_horizontal"
android:padding="16dp"
android:fontFamily="@font/poppins_regular"
android:text="@string/send_tip"
android:textColor="@android:color/white" />
android/java/res/layout/wallet_balance_layout.xml
+11
View File
@@ -32,6 +32,7 @@
android:text="@string/my_wallet"
android:textColor="@android:color/white"
android:textSize="14sp"
android:fontFamily="@font/poppins_regular"
app:drawableEndCompat="@drawable/ic_uphold" />
<ImageView
@@ -57,6 +58,7 @@
android:textAllCaps="false"
android:textColor="@android:color/white"
android:textSize="14sp"
android:fontFamily="@font/poppins_regular"
app:drawableEndCompat="@drawable/disclosure" />
</FrameLayout>
@@ -86,6 +88,7 @@
android:alpha="0.65"
android:text="@string/your_balance"
android:textColor="@android:color/white"
android:fontFamily="@font/poppins_regular"
android:textSize="14sp" />
<LinearLayout
@@ -99,6 +102,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:textColor="@android:color/white"
android:fontFamily="@font/poppins_regular"
android:textSize="24sp" />
<TextView
@@ -107,6 +111,7 @@
android:alpha="0.65"
android:text="@string/bat_text"
android:textColor="@android:color/white"
android:fontFamily="@font/poppins_regular"
android:textSize="14sp" />
</LinearLayout>
@@ -117,6 +122,7 @@
android:layout_height="wrap_content"
android:alpha="0.65"
android:textColor="@android:color/white"
android:fontFamily="@font/poppins_regular"
android:textSize="14sp" />
</LinearLayout>
@@ -148,6 +154,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:fontFamily="@font/poppins_regular"
android:textSize="14sp" />
<TextView
@@ -156,6 +163,7 @@
android:alpha="0.65"
android:text="@string/estimated_earnings"
android:textColor="@android:color/white"
android:fontFamily="@font/poppins_regular"
android:textSize="14sp" />
<LinearLayout
@@ -169,6 +177,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:textColor="@android:color/white"
android:fontFamily="@font/poppins_regular"
android:textSize="24sp" />
<TextView
@@ -177,6 +186,7 @@
android:alpha="0.65"
android:text="@string/bat_text"
android:textColor="@android:color/white"
android:fontFamily="@font/poppins_regular"
android:textSize="14sp" />
</LinearLayout>
@@ -187,6 +197,7 @@
android:layout_height="wrap_content"
android:alpha="0.65"
android:textColor="@android:color/white"
android:fontFamily="@font/poppins_regular"
android:textSize="14sp" />
</LinearLayout>
android/java/res/values/brave_colors.xml
-1
View File
@@ -171,7 +171,6 @@
<color name="vpn_callout_bg_color">#381E85</color>
<color name="brave_plan_bg">#27155E</color>
<color name="settings_section_text_light_color">#868E96</color>
<color name="rewards_settings_button_color">#4C54D2</color>