tbb-commits December 2022

tbb-commits@lists.torproject.org

2 participants
98 discussions

[tor-browser] branch tor-browser-102.5.0esr-12.0-1 updated: fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gitolite role 02 Dec '22

02 Dec '22

1 0

[builders/tor-browser-build] branch main updated (712298eb -> 1adc743f)
by gitolite role 02 Dec '22

02 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch main in repository builders/tor-browser-build. from 712298eb fixup! Bug 40587: Migrate tor-browser-build configs from gitolite to gitlab repos new 1918ecc6 Update rbm for rbm#40049 new 1adc743f Bug 40645: Remove unused signing keys and create individual keyrings for Tor Project developers The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: keyring/boklm.gpg | Bin 0 -> 5610 bytes keyring/dan_b.gpg | Bin 0 -> 3536 bytes keyring/henry-x.gpg | Bin 0 -> 2261 bytes keyring/ma1.gpg | Bin 0 -> 5640 bytes keyring/pierov.gpg | Bin 0 -> 1111 bytes keyring/richard.gpg | Bin 0 -> 6373 bytes keyring/torbutton.gpg | Bin 230677 -> 0 bytes projects/android-components/config | 4 +++- projects/fenix/config | 4 +++- projects/firefox/config | 4 +++- projects/geckoview/config | 4 +++- rbm | 2 +- 12 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 keyring/boklm.gpg create mode 100644 keyring/dan_b.gpg create mode 100644 keyring/henry-x.gpg create mode 100644 keyring/ma1.gpg create mode 100644 keyring/pierov.gpg create mode 100644 keyring/richard.gpg delete mode 100644 keyring/torbutton.gpg -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[builders/tor-browser-build] branch main updated: fixup! Bug 40587: Migrate tor-browser-build configs from gitolite to gitlab repos
by gitolite role 02 Dec '22

02 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 712298eb fixup! Bug 40587: Migrate tor-browser-build configs from gitolite to gitlab repos 712298eb is described below commit 712298ebb3c3af13a6734e04e0f454bda09a22ce Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Fri Dec 2 13:41:22 2022 +0000 fixup! Bug 40587: Migrate tor-browser-build configs from gitolite to gitlab repos updated rbm submodule to use gitlab url --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 2c1c6e61..66930d20 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "rbm"] path = rbm - url = https://git.torproject.org/builders/rbm.git + url = https://gitlab.torproject.org/tpo/applications/rbm.git -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/rbm] branch main updated: Bug 40049: gpg_keyring should allow for array of keyrings
by gitolite role 02 Dec '22

02 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository builders/rbm. The following commit(s) were added to refs/heads/main by this push: new bf35e08 Bug 40049: gpg_keyring should allow for array of keyrings bf35e08 is described below commit bf35e085111a6ffce0c8f5eac49f9ae70ed377fc Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Wed Nov 23 09:49:10 2022 +0000 Bug 40049: gpg_keyring should allow for array of keyrings --- lib/RBM/DefaultConfig.pm | 44 +++++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index 32072c4..b5d8e88 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -157,18 +157,41 @@ our %default_config = ( gpg_bin => 'gpg', gpg_args => '', gpg_allow_expired_keys => 0, - gpg_keyring_path => sub { + gpg_keyring_args => sub { my ($project, $options) = @_; my $gpg_keyring = RBM::project_config($project, 'gpg_keyring', $options); return undef unless $gpg_keyring; - return $gpg_keyring if $gpg_keyring =~ m|^/|; - my $rootpath = RBM::rbm_path("keyring/$gpg_keyring"); - return $rootpath if -f $rootpath; - for my $module (sort keys %{$RBM::config->{modules}}) { - my $modulepath = RBM::rbm_path("modules/$module/keyring/$gpg_keyring"); - return $modulepath if -f $modulepath; + # handle both gpg_keyring being an array or a string + $gpg_keyring = ref $gpg_keyring eq 'ARRAY' ? $gpg_keyring : [ $gpg_keyring ]; + # construct list of keyring paths + my @keyring_args = (); + foreach my $current_keyring (@$gpg_keyring) { + # check for absolute path + if ($current_keyring =~ m|^/|) { + push(@keyring_args, "--keyring $current_keyring"); + goto FOUND_KEYRING; + } + # check for existence in the keyring directory + my $rootpath = RBM::rbm_path("keyring/$current_keyring"); + if (-f $rootpath) { + push(@keyring_args, "--keyring $rootpath"); + goto FOUND_KEYRING; + } + # check for keyring in module's keyring directory + for my $module (sort keys %{$RBM::config->{modules}}) { + my $modulepath = RBM::rbm_path("modules/$module/keyring/$current_keyring"); + if (-f $modulepath) { + push(@keyring_args, "--keyring $modulepath"); + goto FOUND_KEYRING; + } + } + + # fallthrough implies keyring file not found + RBM::exit_error("keyring file $current_keyring is missing"); + FOUND_KEYRING: } - RBM::exit_error("keyring file $gpg_keyring is missing") + my $args = join(" ", @keyring_args); + return $args; }, # Make it possible for gpg_wrapper to allow git tag signed using an expired # key. @@ -177,9 +200,8 @@ our %default_config = ( #!/bin/bash export LC_ALL=C [% - IF c('gpg_keyring_path'); - SET gpg_kr = '--keyring ' _ c('gpg_keyring_path') - _ ' --no-default-keyring --no-auto-check-trustdb --trust-model always'; + IF c('gpg_keyring_args'); + SET gpg_kr = c('gpg_keyring_args') _ ' --no-default-keyring --no-auto-check-trustdb --trust-model always'; END; -%] gpg_verify=0 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 40694: aarch64 tor-expert-bundle for macOS is not exported as part of the browser build
by gitolite role 02 Dec '22

02 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 68b62817 Bug 40694: aarch64 tor-expert-bundle for macOS is not exported as part of the browser build 68b62817 is described below commit 68b6281730437d45e0cb918c0bd8108e3d079254 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Fri Dec 2 11:32:45 2022 +0000 Bug 40694: aarch64 tor-expert-bundle for macOS is not exported as part of the browser build --- projects/browser/build | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/browser/build b/projects/browser/build index 8cbbc20d..57544b46 100644 --- a/projects/browser/build +++ b/projects/browser/build @@ -377,6 +377,12 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ # strip off trailing "$buildid.tar.gz" tor_expert_bundle_dest=${tor_expert_bundle_src:0:-14}.tar.gz cp $rootdir/[% c("input_files_by_name/tor-expert-bundle") %] "$OUTDIR"/$tor_expert_bundle_dest + [% IF c("var/macos_universal") %] + tor_expert_bundle_src="[% c('input_files_by_name/tor-expert-bundle-aarch64') %]" + # strip off trailing "$buildid.tar.gz" + tor_expert_bundle_dest=${tor_expert_bundle_src:0:-14}.tar.gz + cp $rootdir/[% c('input_files_by_name/tor-expert-bundle-aarch64') %] "$OUTDIR"/$tor_expert_bundle_dest + [% END -%] [% END -%] [% IF c("var/build_infos_json") -%] cp $rootdir/[% c('input_files_by_name/firefox') %]/build-infos.json "$OUTDIR"/build-infos-[% c("var/mar_osname") %].json -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.5.0esr-12.0-1 updated: fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by gitolite role 02 Dec '22

02 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.5.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.5.0esr-12.0-1 by this push: new a9bdc4fe2b15 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser a9bdc4fe2b15 is described below commit a9bdc4fe2b1534c670b469c1b52fd8654dccf4eb Author: Henry Wilkes <henry(a)torproject.org> AuthorDate: Thu Dec 1 15:54:34 2022 +0000 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Convert the "View logs" <span> into a <button> and move the data-subcategory="viewlogs" attribute in about:preferences#connection one level below the "Advanced" groupbox. --- .../torconnect/content/aboutTorConnect.css | 21 ++----------------- .../torconnect/content/aboutTorConnect.js | 24 ++++++++++------------ .../torconnect/content/aboutTorConnect.xhtml | 4 +--- .../torpreferences/content/connectionPane.xhtml | 4 ++-- 4 files changed, 16 insertions(+), 37 deletions(-) diff --git a/browser/components/torconnect/content/aboutTorConnect.css b/browser/components/torconnect/content/aboutTorConnect.css index 688a11c4415d..03565940d7d2 100644 --- a/browser/components/torconnect/content/aboutTorConnect.css +++ b/browser/components/torconnect/content/aboutTorConnect.css @@ -281,25 +281,8 @@ input[type="checkbox"]:not(:disabled):active:checked { } /* mirrors p element spacing */ -#viewLogContainer { - margin: 1em 0; - height: 1.2em; - min-height: 1.2em; -} - -#viewLogLink { - position: relative; - display: inline-block; - color: var(--in-content-link-color); -} - -/* hidden apparently only works if no display is set; who knew? */ -#viewLogLink[hidden="true"] { - display: none; -} - -#viewLogLink:hover { - cursor:pointer; +#viewLogButton { + margin: 1em 0; } body { diff --git a/browser/components/torconnect/content/aboutTorConnect.js b/browser/components/torconnect/content/aboutTorConnect.js index 6b33442c7d02..7f127a02288a 100644 --- a/browser/components/torconnect/content/aboutTorConnect.js +++ b/browser/components/torconnect/content/aboutTorConnect.js @@ -53,8 +53,7 @@ class AboutTorConnect { }, }, viewLog: { - container: "#viewLogContainer", - link: "span#viewLogLink", + button: "#viewLogButton", }, quickstart: { container: "div#quickstartContainer", @@ -110,8 +109,7 @@ class AboutTorConnect { tryBridgeLabel: document.querySelector( this.selectors.breadcrumbs.tryBridge.label ), - viewLogContainer: document.querySelector(this.selectors.viewLog.container), - viewLogLink: document.querySelector(this.selectors.viewLog.link), + viewLogButton: document.querySelector(this.selectors.viewLog.button), quickstartContainer: document.querySelector( this.selectors.quickstart.container ), @@ -448,7 +446,7 @@ class AboutTorConnect { this.setTitle(TorStrings.torConnect.torConnect, ""); this.setLongText(TorStrings.settings.torPreferencesDescription); this.setProgress("", false); - this.hide(this.elements.viewLogContainer); + this.hide(this.elements.viewLogButton); this.hideButtons(); this.show(this.elements.quickstartContainer); this.show(this.elements.configureButton); @@ -511,9 +509,9 @@ class AboutTorConnect { } this.hideButtons(); if (state.ShowViewLog) { - this.show(this.elements.viewLogContainer); + this.show(this.elements.viewLogButton); } else { - this.hide(this.elements.viewLogContainer); + this.hide(this.elements.viewLogButton); } this.show(this.elements.cancelButton, true); if (state.StateChanged) { @@ -530,7 +528,7 @@ class AboutTorConnect { BreadcrumbStatus.Active, BreadcrumbStatus.Hidden ); - this.show(this.elements.viewLogContainer); + this.show(this.elements.viewLogButton); this.hideButtons(); this.show(this.elements.configureButton); this.show(this.elements.connectButton, true); @@ -566,7 +564,7 @@ class AboutTorConnect { BreadcrumbStatus.Active, BreadcrumbStatus.Disabled ); - this.show(this.elements.viewLogContainer); + this.show(this.elements.viewLogButton); this.showLocationForm(true, TorStrings.torConnect.tryBridge); if (state.StateChanged) { this.elements.tryBridgeButton.focus(); @@ -586,7 +584,7 @@ class AboutTorConnect { BreadcrumbStatus.Default, BreadcrumbStatus.Active ); - this.show(this.elements.viewLogContainer); + this.show(this.elements.viewLogButton); this.showLocationForm(true, TorStrings.torConnect.tryAgain); if (state.StateChanged) { this.elements.tryBridgeButton.focus(); @@ -716,9 +714,9 @@ class AboutTorConnect { this.elements.tryBridgeLabel.textContent = TorStrings.torConnect.breadcrumbTryBridge; - this.hide(this.elements.viewLogContainer); - this.elements.viewLogLink.textContent = TorStrings.torConnect.viewLog; - this.elements.viewLogLink.addEventListener("click", event => { + this.hide(this.elements.viewLogButton); + this.elements.viewLogButton.textContent = TorStrings.torConnect.viewLog; + this.elements.viewLogButton.addEventListener("click", event => { RPMSendAsyncMessage("torconnect:view-tor-logs"); }); diff --git a/browser/components/torconnect/content/aboutTorConnect.xhtml b/browser/components/torconnect/content/aboutTorConnect.xhtml index 77d2e6889570..6c4d3b9df6de 100644 --- a/browser/components/torconnect/content/aboutTorConnect.xhtml +++ b/browser/components/torconnect/content/aboutTorConnect.xhtml @@ -39,9 +39,7 @@ <p id="connectShortDescText" /> </div> - <div id="viewLogContainer"> - <span id="viewLogLink"></span> - </div> + <button id="viewLogButton"></button> <div id="quickstartContainer"> <input id="quickstartCheckbox" type="checkbox" /> diff --git a/browser/components/torpreferences/content/connectionPane.xhtml b/browser/components/torpreferences/content/connectionPane.xhtml index dded590fe0e7..47dbcb229978 100644 --- a/browser/components/torpreferences/content/connectionPane.xhtml +++ b/browser/components/torpreferences/content/connectionPane.xhtml @@ -167,9 +167,9 @@ <button id="torPreferences-advanced-button" class="accessory-button"/> </hbox> - <hbox align="center"> + <hbox align="center" data-subcategory="viewlogs"> <label id="torPreferences-torLogs" flex="1"/> - <vbox data-subcategory="viewlogs"> + <vbox> <button id="torPreferences-buttonTorLogs" class="accessory-button"/> </vbox> -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[Git][tpo/applications/fenix] Pushed new tag tor-browser-102.2.1-12.0-1-build7
by Richard Pospesel (＠richard) 02 Dec '22

02 Dec '22

Richard Pospesel pushed new tag tor-browser-102.2.1-12.0-1-build7 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-102… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-102.2.1-12.0-1] yec22 home fragment, theming, and timegate toggle
by Richard Pospesel (＠richard) 02 Dec '22

02 Dec '22

Richard Pospesel pushed to branch tor-browser-102.2.1-12.0-1 at The Tor Project / Applications / fenix Commits: f9aea110 by Dan Ballard at 2022-12-02T12:09:59+00:00 yec22 home fragment, theming, and timegate toggle - - - - - 11 changed files: - app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt - + app/src/main/res/drawable/ic_yec22_bg_combined_android_3x.png - + app/src/main/res/drawable/tor_yec_donate_rounded_corners.xml - + app/src/main/res/font/spacegrotesk_light.ttf - + app/src/main/res/font/spacegrotesk_regular.ttf - + app/src/main/res/font/spacegrotesk_semibold.ttf - + app/src/main/res/font/spacemono_bold.ttf - app/src/main/res/layout/fragment_home.xml - app/src/main/res/values/colors.xml - app/src/main/res/values/styles.xml Changes: ===================================== app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -10,11 +10,8 @@ import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.os.StrictMode -import android.view.Gravity -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.view.ViewTreeObserver +import android.util.Log +import android.view.* import android.widget.Button import android.widget.LinearLayout import android.widget.PopupWindow @@ -22,16 +19,10 @@ import androidx.annotation.VisibleForTesting import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet -import androidx.constraintlayout.widget.ConstraintSet.BOTTOM -import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID -import androidx.constraintlayout.widget.ConstraintSet.TOP +import androidx.constraintlayout.widget.ConstraintSet.* import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.content.ContextCompat -import androidx.core.view.children -import androidx.core.view.doOnLayout -import androidx.core.view.isGone -import androidx.core.view.isVisible -import androidx.core.view.updateLayoutParams +import androidx.core.view.* import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.Observer @@ -66,15 +57,13 @@ import mozilla.components.service.glean.private.NoExtras import mozilla.components.support.base.feature.ViewBoundFeatureWrapper import mozilla.components.support.ktx.android.content.res.resolveAttribute import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged +import mozilla.components.support.locale.LocaleManager import mozilla.components.ui.tabcounter.TabCounterMenu -import org.mozilla.fenix.BuildConfig -import org.mozilla.fenix.Config +import org.mozilla.fenix.* import org.mozilla.fenix.GleanMetrics.Events import org.mozilla.fenix.GleanMetrics.HomeScreen import org.mozilla.fenix.GleanMetrics.StartOnHome import org.mozilla.fenix.GleanMetrics.Wallpapers -import org.mozilla.fenix.HomeActivity -import org.mozilla.fenix.R import org.mozilla.fenix.browser.BrowserAnimator.Companion.getToolbarNavOptions import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.components.FenixSnackbar @@ -84,12 +73,7 @@ import org.mozilla.fenix.components.appstate.AppAction import org.mozilla.fenix.components.toolbar.FenixTabCounterMenu import org.mozilla.fenix.components.toolbar.ToolbarPosition import org.mozilla.fenix.databinding.FragmentHomeBinding -import org.mozilla.fenix.ext.components -import org.mozilla.fenix.ext.hideToolbar -import org.mozilla.fenix.ext.nav -import org.mozilla.fenix.ext.requireComponents -import org.mozilla.fenix.ext.runIfFragmentIsAttached -import org.mozilla.fenix.ext.settings +import org.mozilla.fenix.ext.* import org.mozilla.fenix.gleanplumb.DefaultMessageController import org.mozilla.fenix.gleanplumb.MessagingFeature import org.mozilla.fenix.home.mozonline.showPrivacyPopWindow @@ -110,6 +94,7 @@ import org.mozilla.fenix.home.topsites.DefaultTopSitesView import org.mozilla.fenix.nimbus.FxNimbus import org.mozilla.fenix.onboarding.FenixOnboarding import org.mozilla.fenix.perf.MarkersFragmentLifecycleCallbacks +import org.mozilla.fenix.settings.advanced.getSelectedLocale import org.mozilla.fenix.tabstray.TabsTrayAccessPoint import org.mozilla.fenix.tor.bootstrap.TorQuickStart import org.mozilla.fenix.utils.Settings.Companion.TOP_SITES_PROVIDER_MAX_THRESHOLD @@ -117,6 +102,8 @@ import org.mozilla.fenix.utils.ToolbarPopupWindow import org.mozilla.fenix.utils.allowUndo import org.mozilla.fenix.wallpapers.WallpaperManager import java.lang.ref.WeakReference +import java.util.* +import kotlin.concurrent.schedule import kotlin.math.min @Suppress("TooManyFunctions", "LargeClass") @@ -229,6 +216,13 @@ class HomeFragment : Fragment() { ?.replace(" *([.,。।]) *".toRegex(), "$1\n") ?.trim() + binding.yecPoweredbyprivacy.text = localBinding + .yecPoweredbyprivacy + .text + ?.replace(" *([.,。।]) *".toRegex(), "$1\n") + ?.trim() + + currentMode = CurrentMode( requireContext(), onboarding, @@ -411,6 +405,20 @@ class HomeFragment : Fragment() { adjustHomeFragmentView(currentMode.getCurrentMode()) showSessionControlView() + binding.donateNowButton.setOnClickListener { + val country = LocaleManager.getSelectedLocale(requireContext()).country + var locale = LocaleManager.getSelectedLocale(requireContext()).language + if (country != "") { + locale = "${locale}-${country}" + } + val localeUrl = "https://www.torproject.org/pbp-${locale}-mobile" + activity.openToBrowserAndLoad( + searchTermOrURL = localeUrl, + newTab = true, + from = BrowserDirection.FromHome + ) + } + // DO NOT MOVE ANYTHING BELOW THIS addMarker CALL! requireComponents.core.engine.profiler?.addMarker( MarkersFragmentLifecycleCallbacks.MARKER_NAME, profilerStartTime, "HomeFragment.onCreateView", @@ -424,8 +432,34 @@ class HomeFragment : Fragment() { getMenuButton()?.dismissMenu() displayWallpaperIfEnabled() + + //view.donationmatch.setOnClickListener { + // activity.openToBrowserAndLoad( + // searchTermOrURL = "https://blog.torproject.org/friends-of-tor-match-2020", + // newTab = true, + // from = BrowserDirection.FromHome + // ) + //} + + binding.donateNowButton.setOnClickListener { + val country = LocaleManager.getSelectedLocale(requireContext()).country + var locale = LocaleManager.getSelectedLocale(requireContext()).language + if (country != "") { + locale = "${locale}-${country}" + } + val localeUrl = "https://www.torproject.org/pbp-${locale}-mobile" + (activity as HomeActivity).openToBrowserAndLoad( + searchTermOrURL = localeUrl, + newTab = true, + from = BrowserDirection.FromHome + ) + } } + //private fun dismissTip(tip: Tip) { + // sessionControlInteractor.onCloseTip(tip) + //} + /** * Returns a [TopSitesConfig] which specifies how many top sites to display and whether or * not frequently visited sites should be displayed. @@ -577,14 +611,97 @@ class HomeFragment : Fragment() { } } } + val yec22launched = (activity as? HomeActivity)?.themeManager?.isYECActive ?: false + // Hide the onion pattern during Onboarding, too. binding.onionPatternImage.apply { - visibility = if (onboarding.userHasBeenOnboarded()) { + visibility = if (onboarding.userHasBeenOnboarded() && !yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + + // Hide tor browser header during onboarding and EOY event + binding.exploreprivately.apply { + visibility = if (onboarding.userHasBeenOnboarded() && !yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + + + + // Hide EOY header text during onboarding and before event + binding.yecPoweredbyprivacy.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + + + + // Hide the EOY image during Onboarding, and before event + binding.yecActivistImage.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + + binding.yecResistanceImage.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + binding.yecChangeImage.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + binding.yecFreedomImage.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + + // Hide the EOY donate button during Onboarding, and before event + binding.donateNowButton.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + + // Hide EOY donation match text during onboarding and before event + binding.donationmatch.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { View.VISIBLE } else { View.GONE } } + + // Hide the EOY image during Onboarding, and before event + binding.yecImageLayout.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + binding.homeAppBar.apply { visibility = View.VISIBLE @@ -932,7 +1049,11 @@ class HomeFragment : Fragment() { override fun onResume() { super.onResume() if (browsingModeManager.mode == BrowsingMode.Private) { - activity?.window?.setBackgroundDrawableResource(R.drawable.private_home_background_gradient) + if ((activity as? HomeActivity)?.themeManager?.isYECActive ?: false) { + activity?.window?.setBackgroundDrawableResource(R.color.tor_yec_home_background) + } else { + activity?.window?.setBackgroundDrawableResource(R.drawable.private_home_background_gradient) + } } // fenix#40176: Ensure the Home fragment is rendered correctly when we resume. ===================================== app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt ===================================== @@ -23,18 +23,33 @@ import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.customtabs.ExternalAppBrowserActivity +import org.mozilla.fenix.home.HomeFragment +import java.util.* abstract class ThemeManager { + // 1663979387091 // 2022 9 21 - testing + // 1665619200000 // 2022 10 13 + private val yec2022LaunchDate = Date(1665619200000) + // 1672531200000 // 2023 01 01 + private val yec2022EndDate = Date(1672531200000) abstract var currentTheme: BrowsingMode + val isYECActive get() = Date().after(yec2022LaunchDate) && Date().before(yec2022EndDate) + /** * Returns the style resource corresponding to the [currentTheme]. */ @get:StyleRes val currentThemeResource get() = when (currentTheme) { BrowsingMode.Normal -> R.style.NormalTheme - BrowsingMode.Private -> R.style.PrivateTheme + BrowsingMode.Private -> { + if (isYECActive) { + R.style.PrivateEOYTheme + } else { + R.style.PrivateTheme + } + } } /** ===================================== app/src/main/res/drawable/ic_yec22_bg_combined_android_3x.png ===================================== Binary files /dev/null and b/app/src/main/res/drawable/ic_yec22_bg_combined_android_3x.png differ ===================================== app/src/main/res/drawable/tor_yec_donate_rounded_corners.xml ===================================== @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> + + + +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="#C0FF00" /> + <corners android:radius="10dp" /> +</shape> ===================================== app/src/main/res/font/spacegrotesk_light.ttf ===================================== Binary files /dev/null and b/app/src/main/res/font/spacegrotesk_light.ttf differ ===================================== app/src/main/res/font/spacegrotesk_regular.ttf ===================================== Binary files /dev/null and b/app/src/main/res/font/spacegrotesk_regular.ttf differ ===================================== app/src/main/res/font/spacegrotesk_semibold.ttf ===================================== Binary files /dev/null and b/app/src/main/res/font/spacegrotesk_semibold.ttf differ ===================================== app/src/main/res/font/spacemono_bold.ttf ===================================== Binary files /dev/null and b/app/src/main/res/font/spacemono_bold.ttf differ ===================================== app/src/main/res/layout/fragment_home.xml ===================================== @@ -102,6 +102,144 @@ android:lineSpacingMultiplier="1.1" app:layout_scrollFlags="scroll" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="50dp" + android:layout_weight="1" + android:orientation="vertical"> + + <TextView + android:id="@+id/yec_poweredbyprivacy" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:layout_marginStart="35dp" + android:layout_marginEnd="35dp" + android:clickable="false" + android:focusable="false" + android:fontFamily="@font/spacemono_bold" + android:importantForAccessibility="no" + android:text="@string/yec2022_powered_by_privacy" + android:lineSpacingMultiplier="0.8" + android:textColor="#C0FF00" + android:textSize="28sp" + app:layout_scrollFlags="scroll" /> + + <RelativeLayout + android:id="@+id/yec_image_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="22dp" + android:layout_marginStart="35dp" + android:layout_marginEnd="35dp" + android:gravity="center" + android:orientation="vertical" > + + <ImageView + android:id="@+id/yec_activist_image" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:scaleType="fitCenter" + android:paddingTop="10dp" + android:adjustViewBounds="true" + app:layout_scrollFlags="scroll" + app:srcCompat="@drawable/ic_yec22_bg_combined_android_3x" + tools:ignore="ContentDescription" /> + + <TextView + android:id="@+id/yec_resistance_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:paddingStart="80dp" + android:clickable="false" + android:focusable="false" + android:fontFamily="@font/spacegrotesk_semibold" + android:importantForAccessibility="no" + android:rotation="-2.25" + android:text="@string/yec2022_resistance" + android:textColor="#FF8AFF" + android:textSize="33sp" + app:layout_scrollFlags="scroll" /> + + <TextView + android:id="@+id/yec_change_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:paddingStart="80dp" + android:layout_alignLeft="@+id/yec_resistance_image" + android:layout_below="@+id/yec_resistance_image" + android:layout_marginTop="-10dp" + android:clickable="false" + android:focusable="false" + android:fontFamily="@font/spacegrotesk_light" + android:importantForAccessibility="no" + android:rotation="-2.25" + android:text="@string/yec2022_change" + android:textColor="#C0FF00" + android:textSize="33sp" + app:layout_scrollFlags="scroll" /> + + <TextView + android:id="@+id/yec_freedom_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:paddingStart="80dp" + android:layout_alignLeft="@+id/yec_resistance_image" + android:layout_below="@+id/yec_change_image" + android:layout_marginTop="-10dp" + android:clickable="false" + android:focusable="false" + android:fontFamily="@font/spacegrotesk_semibold" + android:importantForAccessibility="no" + android:rotation="-2.25" + android:text="@string/yec2022_freedom" + android:textColor="#FF8AFF" + android:textSize="33sp" + app:layout_scrollFlags="scroll" /> + </RelativeLayout> + + <Button + android:id="@+id/donate_now_button" + style="@style/TorDonateYecButton" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="35dp" + android:layout_marginRight="35dp" + android:layout_marginTop="22dp" + android:background="@drawable/tor_yec_donate_rounded_corners" + android:text="@string/tor_onboarding_donate_button" + android:textAllCaps="false" + android:textColor="#000000" + android:textSize="18sp" + android:textStyle="bold" + android:visibility="visible" + tools:ignore="ButtonStyleXmlDetector" /> + + <TextView + android:id="@+id/donationmatch" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingTop="22dp" + android:paddingStart="35dp" + android:paddingEnd="35dp" + android:clickable="false" + android:focusable="false" + android:fontFamily="@font/spacemono_bold" + android:importantForAccessibility="no" + android:lineSpacingMultiplier="1.1" + android:text="@string/yec2022_donation_matching" + android:textColor="#FAF5DF" + android:textSize="18sp" + android:gravity="center" + android:visibility="visible" + app:layout_scrollFlags="scroll" /> + + + </LinearLayout> </com.google.android.material.appbar.AppBarLayout> <androidx.recyclerview.widget.RecyclerView ===================================== app/src/main/res/values/colors.xml ===================================== @@ -273,7 +273,7 @@ <color name="sync_disconnected_background_private_theme">#5B5846</color> <color name="onboarding_illustration_deselected_private_theme">#99FBFBFE</color> <color name="prompt_login_edit_text_cursor_color_private_theme">@color/photonViolet50</color> - + <color name="tor_yec_home_background">#0E0625</color>  <color name="accent_normal_theme">@color/photonInk20</color> <color name="accent_high_contrast_normal_theme">@color/photonInk20</color> ===================================== app/src/main/res/values/styles.xml ===================================== @@ -330,6 +330,11 @@ <style name="PrivateTheme" parent="PrivateThemeBase" /> + <style name="PrivateEOYTheme" parent="PrivateThemeBase" > + <item name="android:windowBackground">@color/tor_yec_home_background</item> + <item name="homeBackground">@color/tor_yec_home_background</item> + </style> +  <style name="WindowAnimationTransition"> <item name="android:windowEnterAnimation">@anim/fade_in</item> @@ -368,6 +373,21 @@ <item name="android:textColor">#000000</item> </style> + + <style name="TorDonateYecButton" parent="NeutralButton"> + <item name="android:background">@drawable/tor_yec_donate_rounded_corners</item> + <item name="backgroundTint">#C0FF00</item> + <item name="android:textColor">#000000</item> + <item name="android:fontFamily">@font/spacemono_bold</item> + <item name="fontFamily">@font/spacemono_bold</item> + </style> + + <style name="TorDonateYecButtonText" parent="Base.TextAppearance.MaterialComponents.Badge"> + + <item name="android:textStyle">bold</item> + <item name="android:textColor">#000000</item> + </style> + <style name="DestructiveButton" parent="NeutralButton"> <item name="iconTint">@color/fx_mobile_text_color_warning</item> <item name="android:textColor">@color/fx_mobile_text_color_warning</item> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/f9aea110ce4f4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/f9aea110ce4f4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits December 2022