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.

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

ios updates #83

Merged
merged 1 commit into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions ios/brave-ios/App/BraveWidgets/BraveWidgets.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import WidgetKit
struct BraveWidgets: WidgetBundle {
var body: some Widget {
ShortcutsWidget()
// FavoritesWidget()
FavoritesWidget()
// TopNewsWidget()
// TopNewsListWidget()
// SingleStatWidget()
// StatsWidget()
SingleStatWidget()
StatsWidget()
LockScreenShortcutWidget()
// LockScreenFavoriteWidget()
}
Expand Down
21 changes: 12 additions & 9 deletions ios/brave-ios/App/Client.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1867,7 +1867,7 @@
CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/iOS/Entitlements/Debug (AppStore).entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = "\"$(PROJECT_DIR)/../Sources/Brave/Frontend/Preview Content\"";
DEVELOPMENT_TEAM = 39SSC8S97L;
Expand Down Expand Up @@ -2102,7 +2102,7 @@
CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/iOS/Entitlements/Release.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_ASSET_PATHS = "\"$(PROJECT_DIR)/../Sources/Brave/Frontend/Preview Content\"";
DEVELOPMENT_TEAM = 39SSC8S97L;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -3273,7 +3273,7 @@
CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/iOS/Entitlements/Release (AppStore).entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_ASSET_PATHS = "\"$(PROJECT_DIR)/../Sources/Brave/Frontend/Preview Content\"";
DEVELOPMENT_TEAM = 39SSC8S97L;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -3365,10 +3365,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon_Nightly;
CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/iOS/Entitlements/Nightly.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_ASSET_PATHS = "\"$(PROJECT_DIR)/../Sources/Brave/Frontend/Preview Content\"";
DEVELOPMENT_TEAM = 39SSC8S97L;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "iOS/Supporting Files/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = Ping;
MARKETING_VERSION = 1.0;
Expand Down Expand Up @@ -3453,15 +3453,18 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon_Beta;
CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/iOS/Entitlements/Beta.entitlements";
CURRENT_PROJECT_VERSION = 2;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_ASSET_PATHS = "\"$(PROJECT_DIR)/../Sources/Brave/Frontend/Preview Content\"";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "iOS/Supporting Files/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = Ping;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.ping.ios.browser.beta;
PRODUCT_MODULE_NAME = Client;
PRODUCT_NAME = Client;
PROVISIONING_PROFILE_SPECIFIER = "Brave iOS Beta";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
};
name = Beta;
Expand Down Expand Up @@ -3539,7 +3542,7 @@
CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/iOS/Entitlements/Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = "\"$(PROJECT_DIR)/../Sources/Brave/Frontend/Preview Content\"";
DEVELOPMENT_TEAM = 39SSC8S97L;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ extension PrivacyReportsView {
{
HStack(alignment: .top) {
HStack {
if !sizeCategory.isAccessibilityCategory {
if false && !sizeCategory.isAccessibilityCategory {
Image("brave_document", bundle: .module)
}
Text(Strings.PrivacyHub.notificationCalloutBody)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ class TopToolbarView: UIView, ToolbarProtocol {
shieldsRewardsStack.addArrangedSubview(rewardsButton)

[
leadingItemsStackView, locationContainer, trailingItemsStackView,
leadingItemsStackView, locationContainer, shieldsRewardsStack, trailingItemsStackView,
cancelButton,
].forEach {
mainStackView.addArrangedSubview($0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ extension Preferences {

/// Tells the app whether we should show Privacy Hub in new tab page view controller
public static let showNewTabPrivacyHub =
Option<Bool>(key: "newtabpage.show-newtab-privacyhub", default: false)
Option<Bool>(key: "newtabpage.show-newtab-privacyhub", default: true)

/// First time when privacy hub hide action is tieggered user will be shown alert
static let hidePrivacyHubAlertShown = Option<Bool>(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class NTPTableViewController: TableViewController {
]
)

dataSource.sections = [imageSection, widgetSection]
dataSource.sections = [widgetSection]
}

private func selectedItem() -> BackgroundImageType {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ struct AdvancedShieldsSettingsView: View {

var body: some View {
List {
// DefaultShieldsViewView(settings: settings)
DefaultShieldsViewView(settings: settings)
ClearDataSectionView(settings: settings)

Section {
Expand All @@ -46,14 +46,14 @@ struct AdvancedShieldsSettingsView: View {
ManageWebsiteDataView()
}

// NavigationLink {
// PrivacyReportSettingsView()
// } label: {
// LabelView(
// title: Strings.PrivacyHub.privacyReportsTitle,
// subtitle: nil
// )
// }.listRowBackground(Color(.secondaryBraveGroupedBackground))
NavigationLink {
PrivacyReportSettingsView()
} label: {
LabelView(
title: Strings.PrivacyHub.privacyReportsTitle,
subtitle: nil
)
}.listRowBackground(Color(.secondaryBraveGroupedBackground))
}

OtherPrivacySettingsSectionView(settings: settings)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ struct PrivacyReportSettingsView: View {
}
.listRowBackground(Color(.secondaryBraveGroupedBackground))

Section(footer: Text(Strings.PrivacyHub.settingsEnableVPNAlertsFooter)) {
Toggle(Strings.PrivacyHub.settingsEnableVPNAlertsTitle, isOn: $vpnAlertsEnabled.value)
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
}
.listRowBackground(Color(.secondaryBraveGroupedBackground))
// Section(footer: Text(Strings.PrivacyHub.settingsEnableVPNAlertsFooter)) {
// Toggle(Strings.PrivacyHub.settingsEnableVPNAlertsTitle, isOn: $vpnAlertsEnabled.value)
// .toggleStyle(SwitchToggleStyle(tint: .accentColor))
// }
// .listRowBackground(Color(.secondaryBraveGroupedBackground))

Section(footer: Text(Strings.PrivacyHub.settingsSlearDataFooter)) {
HStack {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -667,17 +667,17 @@ class SettingsViewController: TableViewController {
self.navigationController?.pushViewController(optionsViewController, animated: true)
}
display.rows.append(row)
// display.rows.append(
// Row(
// text: Strings.NTP.settingsTitle,
// selection: { [unowned self] in
// self.navigationController?.pushViewController(NTPTableViewController(), animated: true)
// },
// image: UIImage(braveSystemNamed: "leo.window.tab-new"),
// accessory: .disclosureIndicator,
// cellClass: MultilineValue1Cell.self
// )
// )
display.rows.append(
Row(
text: Strings.NTP.settingsTitle,
selection: { [unowned self] in
self.navigationController?.pushViewController(NTPTableViewController(), animated: true)
},
image: UIImage(braveSystemNamed: "leo.window.tab-new"),
accessory: .disclosureIndicator,
cellClass: MultilineValue1Cell.self
)
)

// We do NOT persistently save page-zoom settings in Private Browsing
if !tabManager.privateBrowsingManager.isPrivateBrowsing {
Expand Down
22 changes: 11 additions & 11 deletions ios/brave-ios/Sources/BraveShared/BraveURLs.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ import UIKit
extension URL {
public enum Brave {
public static let community = URL(string: "https://ping-browser.com/faqs-and-help")!
public static let account = URL(string: "https://account.brave.com")!
public static let account = URL(string: "https://account.ping-browser.com")!
public static let privacy = URL(string: "https://ping-browser.com/privacy-policy")!
public static let braveNews = URL(string: "https://brave.com/brave-news/")!
public static let braveNewsPrivacy = URL(string: "https://brave.com/privacy/#brave-news")!
public static let braveOffers = URL(string: "https://offers.brave.com/")!
public static let braveNews = URL(string: "https://ping-browser.com/brave-news/")!
public static let braveNewsPrivacy = URL(string: "https://ping-browser.com/privacy/#brave-news")!
public static let braveOffers = URL(string: "https://offers.ping-browser.com/")!
public static let playlist = URL(string: "https://ping-browser.com/faqs-and-help")!
public static let rewardsOniOS = URL(string: "https://brave.com/rewards-ios/")!
public static let rewardsOniOS = URL(string: "https://ping-browser.com/rewards-ios/")!
public static let rewardsUnverifiedPublisherLearnMoreURL = URL(
string: "https://brave.com/faq-rewards/#unclaimed-funds"
string: "https://ping-browser.com/faq-rewards/#unclaimed-funds"
)!
public static let termsOfUse = URL(string: "https://ping-browser.com/terms-of-use-1")!
public static let batTermsOfUse = URL(
string: "https://basicattentiontoken.org/user-terms-of-service/"
)!
public static let ntpTutorialPage = URL(string: "https://brave.com/ja/ntp-tutorial")!
public static let privacyFeatures = URL(string: "https://brave.com/privacy-features/")!
public static let ntpTutorialPage = URL(string: "https://ping-browser.com/ja/ntp-tutorial")!
public static let privacyFeatures = URL(string: "https://ping-browser.com/privacy-features/")!
public static let support = URL(string: "https://ping-browser.com/faqs-and-help")!
public static let p3aHelpArticle = URL(
string: "https://ping-browser.com/faqs-and-help"
Expand All @@ -32,7 +32,7 @@ extension URL {
string: "https://ping-browser.com/faqs-and-help"
)!
public static let braveVPNLinkReceiptProd = URL(
string: "https://account.brave.com/?intent=connect-receipt&product=vpn"
string: "https://account.ping-browser.com/?intent=connect-receipt&product=vpn"
)!
public static let braveVPNLinkReceiptStaging = URL(
string: "https://account.bravesoftware.com/?intent=connect-receipt&product=vpn"
Expand All @@ -47,7 +47,7 @@ extension URL {
string: "https://support.apple.com/guide/security/secd8831e732/web"
)!
public static let braveLeoManageSubscriptionProd = URL(
string: "https://account.brave.com/plans"
string: "https://account.ping-browser.com/plans"
)!
public static let braveLeoManageSubscriptionStaging = URL(
string: "https://account.bravesoftware.com/plans"
Expand All @@ -56,7 +56,7 @@ extension URL {
string: "https://account.brave.software/plans"
)!
public static let braveLeoLinkReceiptProd = URL(
string: "https://account.brave.com/?intent=link-order&product=leo"
string: "https://account.ping-browser.com/?intent=link-order&product=leo"
)!
public static let braveLeoLinkReceiptStaging = URL(
string: "https://account.bravesoftware.com/?intent=link-order&product=leo"
Expand Down
42 changes: 21 additions & 21 deletions ios/brave-ios/Sources/BraveShields/ShieldStrings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -142,17 +142,17 @@ extension Strings.Shields {
tableName: "BraveShared",
bundle: .module,
value:
"To address this issue, Brave can adjust your shields settings for you. Once adjusted, you can try watching this content in Brave Player instead.",
"To address this issue, Ping can adjust your shields settings for you. Once adjusted, you can try watching this content in Ping Player instead.",
comment: "A descriptive message explaining to disable shields on this site."
)

/// A button that disables ad-blocking and uses brave player
/// A button that disables ad-blocking and uses ping player
public static let antiAdBlockWarningConfirmationButton = NSLocalizedString(
"AntiAdBlockWarningConfirmationButton",
tableName: "BraveShared",
bundle: .module,
value: "Adjust Shields For Me",
comment: "A button that disables ad-blocking and uses brave player."
comment: "A button that disables ad-blocking and uses ping player."
)

/// A button that dismisses the warning and does nothing
Expand All @@ -164,74 +164,74 @@ extension Strings.Shields {
comment: "A button that dismisses the warning and does nothing."
)

/// A discription of the Brave Player
/// A discription of the Ping Player
public static let antiAdBlockWarningBravePlayerDescription = NSLocalizedString(
"AntiAdBlockWarningBravePlayerDescription",
tableName: "BraveShared",
bundle: .module,
value: "**Brave Player** is your ticket to an ad-free and uninterrupted video experience.",
comment: "A discription of the Brave Player."
comment: "A discription of the Ping Player."
)
}

// MARK: - Brave Player
// MARK: - Ping Player

extension Strings.Shields {
/// Title for the brave player feature
/// Title for the ping player feature
public static let bravePlayer = NSLocalizedString(
"BravePlayer",
tableName: "BraveShared",
bundle: .module,
value: "Brave Player",
comment: "Title for the brave player feature"
comment: "Title for the ping player feature"
)

/// Title for the brave player info popup which appears when clicking on the brave player icon on the navigation bar
/// Title for the ping player info popup which appears when clicking on the ping player icon on the navigation bar
public static let bravePlayerInfoTitle = NSLocalizedString(
"BravePlayerInfoTitle",
tableName: "BraveShared",
bundle: .module,
value: "Watch In Brave Player Instead",
value: "Watch In Ping Player Instead",
comment:
"Title for the brave player info popup which appears when clicking on the brave player icon on the navigation bar."
"Title for the ping player info popup which appears when clicking on the ping player icon on the navigation bar."
)

/// A description of the brave player that is presented on the info panel when clicing on the brave player icon for the first time
/// A description of the ping player that is presented on the info panel when clicing on the ping player icon for the first time
public static let bravePlayerInfoMessage = NSLocalizedString(
"BravePlayerInfoMessage",
tableName: "BraveShared",
bundle: .module,
value: "Brave Player lets you watch videos without interruptions.",
comment:
"A description of the brave player that is presented on the info panel when clicing on the brave player icon for the first time."
"A description of the ping player that is presented on the info panel when clicing on the ping player icon for the first time."
)

/// A label for a toggle that enables automatic launching of brave player for certain sites
/// A label for a toggle that enables automatic launching of ping player for certain sites
public static let bravePlayerAlwaysOpenVideoLinks = NSLocalizedString(
"BravePlayerAlwaysOpenYouTubeLinks",
tableName: "BraveShared",
bundle: .module,
value: "Always open videos from this site with Brave Player",
value: "Always open videos from this site with Ping Player",
comment:
"A label for a toggle that enables automatic launching of brave player for certain sites"
"A label for a toggle that enables automatic launching of ping player for certain sites"
)

/// A button that confirms to use the brave player
/// A button that confirms to use the ping player
public static let bravePlayerConfirmButton = NSLocalizedString(
"BravePlayerConfirmButton",
tableName: "BraveShared",
bundle: .module,
value: "Try It Out",
comment: "A button that confirms to use the brave player."
comment: "A button that confirms to use the ping player."
)

/// A button that ignores the brave player
/// A button that ignores the ping player
public static let bravePlayerDismissButton = NSLocalizedString(
"BravePlayerDismissButton",
tableName: "BraveShared",
bundle: .module,
value: "Not Now",
comment: "A button that ignores the brave player"
comment: "A button that ignores the ping player"
)
}

Expand Down Expand Up @@ -293,7 +293,7 @@ extension Strings.Shields {
tableName: "BraveShared",
bundle: .module,
value:
"Because you requested to aggressively block trackers and ads, Brave is blocking this site before the first network connection.",
"Because you requested to aggressively block trackers and ads, Ping is blocking this site before the first network connection.",
comment: "A description in the warning page that appears when a page was blocked"
)

Expand Down
Loading
Loading