Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changed theme and leftover icons and strings for android #26

Merged
merged 2 commits into from
May 18, 2024
Merged

Changed theme and leftover icons and strings for android #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9309691
changed theme leftover icons and strings
Nikhil7174 May 17, 2024
32dac83
changed package name for all builds
Nikhil7174 May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...d/java/org/chromium/chrome/browser/notifications/retention/RetentionNotificationUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

public class RetentionNotificationUtil {
public static String NOTIFICATION_TYPE = "notification_type";
private static final String BRAVE_BROWSER = "Brave Browser";
private static final String BRAVE_BROWSER = "Ping Browser";

public static final String HOUR_3 = "hour_3";
public static final String HOUR_24 = "hour_24";
Expand Down
Binary file modified android/java/res/drawable-hdpi/chromelogo16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/java/res/drawable-hdpi/ic_chrome.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/java/res/drawable-mdpi/chromelogo16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/java/res/drawable-mdpi/ic_chrome.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...res/drawable-night-nodpi/ic_quick_action_search_and_bookmark_widget_preview.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .../java/res/drawable-nodpi/ic_quick_action_search_and_bookmark_widget_preview.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/java/res/drawable-xhdpi/chromelogo16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/java/res/drawable-xhdpi/ic_chrome.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/java/res/drawable-xxhdpi/chromelogo16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/java/res/drawable-xxhdpi/ic_chrome.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/java/res/drawable-xxxhdpi/chromelogo16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/java/res/drawable-xxxhdpi/ic_chrome.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions android/java/res/values-night/brave_colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<resources>
<!-- Theme colors -->
<!-- Overriding chromium theme colors to brave theme colors -->
<color name="baseline_primary_90">#5B2A23</color>
<color name="baseline_primary_80">#F35333</color>
<color name="baseline_primary_90">#235B47</color>
<color name="baseline_primary_80">#33F3AD</color>
<color name="default_text_color_on_accent1_baseline">@color/default_text_color_on_accent1_light</color>
<color name="dialog_bg_color_dark_baseline">@color/default_bg_color_baseline</color>

Expand Down
10 changes: 5 additions & 5 deletions android/java/res/values/brave_colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@

<!-- Overriding chromium theme colors to brave theme colors -->
<color name="baseline_primary_90">#F9C3B6</color>
<color name="baseline_primary_80">#FF7654</color>
<color name="baseline_primary_40">#EA3A0D</color>
<color name="baseline_primary_80">#0BDB8B</color>
<color name="baseline_primary_40">#06BA75</color>
<color name="baseline_primary_20">@color/modern_blue_600</color>
<color name="baseline_primary_10">@color/modern_blue_700</color>
<color name="black_alpha_30">#4D000000</color>
<color name="black_alpha_50">#80000000</color>
<color name="modern_blue_300">#FF7654</color>
<color name="modern_blue_300">#0BDB8B</color>
<color name="modern_blue_600">#EA3A0D</color>
<color name="modern_blue_700">#C22700</color>
<color name="dialog_bg_color_dark_baseline">@color/toolbar_background_primary_dark</color>
Expand All @@ -46,7 +46,7 @@
<color name="brave_text_button_color">#4C54D2</color>

<!-- Onboarding colors -->
<color name="onboarding_orange">#fb542b</color>
<color name="onboarding_orange">#07F5A2</color>
<color name="onboarding_gray">#84889c</color>
<color name="onboarding_black">#1e2029</color>
<color name="onboarding_radio_button_active">#f0f1ff</color>
Expand Down Expand Up @@ -94,7 +94,7 @@
<color name="brave_set_default_dialog_text_color">@color/modern_grey_700</color>

<!-- Theme colors -->
<color name="brave_theme_color">#fb542b</color>
<color name="brave_theme_color">#23DE99</color>
<color name="brave_tab_view_card_selected_bg">@color/baseline_primary_80</color>
<color name="brave_add_widget_button_pressed">#737ADE</color>
<color name="brave_button_color">#4C54D2</color>
Expand Down
10 changes: 5 additions & 5 deletions build/commands/lib/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,17 +523,17 @@ Config.prototype.buildArgs = function () {
args.android_channel = this.channel
if (!this.isReleaseBuild()) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change will only reflect in non release builds

btw why is this needed and what might be impacted by changing this?

Copy link
Collaborator Author

@Nikhil7174 Nikhil7174 May 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed package name for all builds.
It is needed to change the package name which is also visible in ui (dowloads settings), screenshot provided above.

args.android_channel = 'default'
args.chrome_public_manifest_package = 'com.brave.browser_default'
args.chrome_public_manifest_package = 'com.ping.browser_default'
} else if (this.channel === '') {
args.android_channel = 'stable'
args.chrome_public_manifest_package = 'com.brave.browser'
args.chrome_public_manifest_package = 'com.ping.browser'
} else if (this.channel === 'beta') {
args.chrome_public_manifest_package = 'com.brave.browser_beta'
args.chrome_public_manifest_package = 'com.ping.browser_beta'
} else if (this.channel === 'dev') {
args.chrome_public_manifest_package = 'com.brave.browser_dev'
args.chrome_public_manifest_package = 'com.ping.browser_dev'
} else if (this.channel === 'nightly') {
args.android_channel = 'canary'
args.chrome_public_manifest_package = 'com.brave.browser_nightly'
args.chrome_public_manifest_package = 'com.ping.browser_nightly'
}
// exclude_unwind_tables is inherited form upstream and is false for any
// Android build
Expand Down
Loading