mirror/IronFox
1
0
Fork 0
mirror of https://github.com/ironfox-oss/IronFox.git synced 2026-01-26 15:03:43 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
929e05ab7c8e1663aaa7fa6d1a5a71fa24ba40e6
IronFox/patches/branding.patch

199 lines
10 KiB
Diff
Raw Blame History

diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingScreen.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingScreen.kt
index 732a80cb03..7a2fdae0c3 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingScreen.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingScreen.kt
@@ -135,6 +135,8 @@ fun OnboardingScreen(
if (!settings.shouldShowMarketingOnboarding && isNotPartnershipDistribution) {
val marketingPage = pagesToDisplay.find { it.type == OnboardingPageUiData.Type.MARKETING_DATA }
marketingPage?.let { pagesToDisplay.remove(it) }
+ val syncPage = pagesToDisplay.find { it.type == OnboardingPageUiData.Type.SYNC_SIGN_IN }
+ syncPage?.let { pagesToDisplay.remove(it) }
}
onDispose {
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
index baadbd7873..32d4fdabb8 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
@@ -206,17 +206,17 @@ class AwesomeBarView(
var searchEngine = searchState.selectedOrDefaultSearchEngine?.name
if (!searchEngine.isNullOrEmpty()) {
- searchEngine = when (searchEngine) {
- GOOGLE_SEARCH_ENGINE_NAME -> getString(
- activity,
- R.string.google_search_engine_suggestion_header,
- )
- else -> getString(
+ searchEngine =
+// GOOGLE_SEARCH_ENGINE_NAME -> getString(
+// activity,
+// R.string.google_search_engine_suggestion_header,
+// )
+ getString(
activity,
R.string.other_default_search_engine_suggestion_header,
searchEngine,
)
- }
+// }
}
return searchEngine
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt
index b45fdee550..45dbba4891 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt
@@ -206,11 +206,11 @@ class AboutFragment(
AboutPageItem(
AboutItem.ExternalLink(
SUPPORT,
- SupportUtils.getSumoURLForTopic(context, SupportUtils.SumoTopic.HELP),
+ "https://gitlab.com/ironfox-oss/IronFox/-/issues",
),
getString(R.string.about_support),
),
- AboutPageItem(
+/* AboutPageItem(
AboutItem.Crashes,
getString(R.string.about_crashes),
),
@@ -227,7 +227,7 @@ class AboutFragment(
SupportUtils.getSumoURLForTopic(context, SupportUtils.SumoTopic.YOUR_RIGHTS),
),
getString(R.string.about_know_your_rights),
- ),
+ ),*/
AboutPageItem(
AboutItem.ExternalLink(LICENSING_INFO, ABOUT_LICENSE_URL),
getString(R.string.about_licensing_information),
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
index dd0ae4ad87..f05742fcf6 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
@@ -24,10 +24,10 @@ object SupportUtils {
const val RATE_APP_URL = "market://details?id=" + BuildConfig.APPLICATION_ID
const val WIKIPEDIA_URL = "https://www.wikipedia.org/"
const val FENIX_PLAY_STORE_URL = "https://play.google.com/store/apps/details?id=${BuildConfig.APPLICATION_ID}"
- const val GOOGLE_URL = "https://www.google.com/"
- const val GOOGLE_US_URL = "https://www.google.com/webhp?client=firefox-b-1-m&channel=ts"
- const val GOOGLE_XX_URL = "https://www.google.com/webhp?client=firefox-b-m&channel=ts"
- const val WHATS_NEW_URL = "https://www.mozilla.org/firefox/android/notes"
+ const val GOOGLE_URL = ""
+ const val GOOGLE_US_URL = ""
+ const val GOOGLE_XX_URL = ""
+ const val WHATS_NEW_URL = "https://gitlab.com/ironfox-oss/IronFox/-/releases"
const val FXACCOUNT_SUMO_URL = "https://support.mozilla.org/kb/access-mozilla-services-firefox-account"
const val ANDROID_SUPPORT_SUMO_URL = "mzl.la/AndroidSupport"
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt
index e5ab956ac3..8f88bf456e 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt
@@ -82,7 +82,7 @@ class OnboardingFragment : Fragment() {
pagesToDisplay(
showDefaultBrowserPage = isNotDefaultBrowser(this) && !isDefaultBrowserPromptSupported(),
showNotificationPage = canShowNotificationPage(),
- showAddWidgetPage = canShowAddSearchWidgetPrompt(AppWidgetManager.getInstance(activity)),
+ showAddWidgetPage = false,
).toMutableList()
}
}
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingMapper.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingMapper.kt
index 795fcd7b7e..1b4d2eef78 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingMapper.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingMapper.kt
@@ -32,7 +32,7 @@ internal fun Collection<OnboardingCardData>.toPageUiData(
.sortedBy { it.ordering }
.mapIndexed { index, onboardingCardData ->
// only first onboarding card shows privacy caption
- onboardingCardData.toPageUiData(if (index == 0) privacyCaption else null)
+ onboardingCardData.toPageUiData(null)
}
}
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/TermsOfServiceOnboardingPage.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/TermsOfServiceOnboardingPage.kt
index 10488889d7..f916d94cc9 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/TermsOfServiceOnboardingPage.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/TermsOfServiceOnboardingPage.kt
@@ -135,22 +135,22 @@ private fun BodyText(
modifier = Modifier.padding(horizontal = 10.dp),
) {
val lineOneState = LinkTextState(
- text = it.lineOneLinkText,
+ text = "",
url = it.lineOneLinkUrl,
- onClick = eventHandler::onTermsOfServiceLinkClicked,
+ onClick = {},
)
val lineTwoState = LinkTextState(
- text = it.lineTwoLinkText,
+ text = "",
url = it.lineTwoLinkUrl,
- onClick = eventHandler::onPrivacyNoticeLinkClicked,
+ onClick = {},
)
val lineThreeState = LinkTextState(
- text = it.lineThreeLinkText,
+ text = "",
url = "",
- onClick = { _ -> eventHandler.onManagePrivacyPreferencesLinkClicked() },
+ onClick = {},
)
LinkText(
- text = it.lineOneText.updateFirstPlaceholder(it.lineOneLinkText),
+ text = "",
linkTextStates = listOf(
lineOneState,
),
@@ -162,7 +162,7 @@ private fun BodyText(
)
LinkText(
- text = it.lineTwoText.updateFirstPlaceholder(it.lineTwoLinkText),
+ text = "",
linkTextStates = listOf(
lineTwoState,
),
@@ -174,7 +174,7 @@ private fun BodyText(
)
LinkText(
- text = it.lineThreeText.updateFirstPlaceholder(it.lineThreeLinkText),
+ text = "",
linkTextStates = listOf(
lineThreeState,
),
diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure
index 0e2a6efdc9..3d7ff4a88f 100644
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -116,7 +116,7 @@ imply_option("MOZ_SERVICES_HEALTHREPORT", True)
imply_option("MOZ_GECKOVIEW_HISTORY", True)
imply_option("MOZ_APP_UA_NAME", "Firefox")
-imply_option("MOZ_APP_VENDOR", "Mozilla")
+imply_option("MOZ_APP_VENDOR", "IronFox OSS")
imply_option("MOZ_APP_ID", "{aa3c5121-dab2-40e2-81ca-7ea25febc110}")
imply_option("BROWSER_CHROME_URL", "chrome://geckoview/content/geckoview.xhtml")
@@ -153,3 +153,5 @@ set_config(
"MOZ_ANDROID_FAT_AAR_ARCHITECTURES",
depends("MOZ_ANDROID_FAT_AAR_ARCHITECTURES")(lambda x: x),
)
+
+include("ironfox.configure")
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index 8913d9f230..0bad31b1a5 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -444,7 +444,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
var shouldShowPrivacyPopWindow by booleanPreference(
appContext.getPreferenceKey(R.string.pref_key_privacy_pop_window),
- default = true,
+ default = false,
)
var shouldUseLightTheme by booleanPreference(
Reference in New Issue View Git Blame Copy Permalink