Matthew Finkel pushed to branch tor-browser-85.0.0b7-10.5-1 at The Tor Project / Applications / fenix

Commits:

11 changed files:

Changes:

  • LICENSE
    ... ... @@ -371,328 +371,3 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
    371 371
     
    
    372 372
       This Source Code Form is "Incompatible With Secondary Licenses", as
    
    373 373
       defined by the Mozilla Public License, v. 2.0.
    374
    -
    
    375
    -===============================================================================
    
    376
    -
    
    377
    -"White On Black" font embedded in chrome/skin/aboutTorFonts.css is licensed under:
    
    378
    -
    
    379
    -Non Exclusive License Agreement
    
    380
    -
    
    381
    -Object: Imagex font called « White on Black »
    
    382
    -Owner: Daniel Hochard
    
    383
    -
    
    384
    -1. Allowed uses
    
    385
    -The user may use this font on any surface such as logo, paper, web sites,
    
    386
    -textile, Online medias, except TV, cinéma and advertising campaign.
    
    387
    -2. Number of users : 5
    
    388
    -All users must belong to the same company or household purchasing the font.
    
    389
    -3. Modifications
    
    390
    -The user can modify this font itself without written consent of the owner.
    
    391
    -4. This font belongs to Daniel Hochard. The user may not sell it as a font (in a
    
    392
    -font bank or a commercial fonts web site, for example).
    
    393
    -The fee for this font was paid on paypal the 29 september 2020
    
    394
    -
    
    395
    -===============================================================================
    
    396
    -
    
    397
    -"Terminal Grotesque Open" font embedded in chrome/skin/aboutTorFonts.css is licensed
    
    398
    -under the SIL Open Font License, Version 1.1.
    
    399
    -This license is copied below, and is also available with a FAQ at:
    
    400
    -http://scripts.sil.org/OFL
    
    401
    -
    
    402
    -===============================================================================
    
    403
    -
    
    404
    -SIL OPEN FONT LICENSE
    
    405
    -
    
    406
    -Version 1.1 - 26 February 2007
    
    407
    -
    
    408
    -PREAMBLE
    
    409
    -
    
    410
    -The goals of the Open Font License (OFL) are to stimulate worldwide
    
    411
    -development of collaborative font projects, to support the font creation
    
    412
    -efforts of academic and linguistic communities, and to provide a free and
    
    413
    -open framework in which fonts may be shared and improved in partnership
    
    414
    -with others.
    
    415
    -
    
    416
    -The OFL allows the licensed fonts to be used, studied, modified and
    
    417
    -redistributed freely as long as they are not sold by themselves. The
    
    418
    -fonts, including any derivative works, can be bundled, embedded,
    
    419
    -redistributed and/or sold with any software provided that any reserved
    
    420
    -names are not used by derivative works. The fonts and derivatives,
    
    421
    -however, cannot be released under any other type of license. The
    
    422
    -requirement for fonts to remain under this license does not apply
    
    423
    -to any document created using the fonts or their derivatives.
    
    424
    -DEFINITIONS
    
    425
    -
    
    426
    -"Font Software" refers to the set of files released by the Copyright
    
    427
    -Holder(s) under this license and clearly marked as such. This may
    
    428
    -include source files, build scripts and documentation.
    
    429
    -
    
    430
    -"Reserved Font Name" refers to any names specified as such after the
    
    431
    -copyright statement(s).
    
    432
    -
    
    433
    -"Original Version" refers to the collection of Font Software components as
    
    434
    -distributed by the Copyright Holder(s).
    
    435
    -
    
    436
    -"Modified Version" refers to any derivative made by adding to, deleting,
    
    437
    -or substituting — in part or in whole — any of the components of the
    
    438
    -Original Version, by changing formats or by porting the Font Software to a
    
    439
    -new environment.
    
    440
    -
    
    441
    -"Author" refers to any designer, engineer, programmer, technical
    
    442
    -writer or other person who contributed to the Font Software.
    
    443
    -PERMISSION & CONDITIONS
    
    444
    -
    
    445
    -Permission is hereby granted, free of charge, to any person obtaining
    
    446
    -a copy of the Font Software, to use, study, copy, merge, embed, modify,
    
    447
    -redistribute, and sell modified and unmodified copies of the Font
    
    448
    -Software, subject to the following conditions:
    
    449
    -
    
    450
    -1) Neither the Font Software nor any of its individual components,
    
    451
    -in Original or Modified Versions, may be sold by itself.
    
    452
    -
    
    453
    -2) Original or Modified Versions of the Font Software may be bundled,
    
    454
    -redistributed and/or sold with any software, provided that each copy
    
    455
    -contains the above copyright notice and this license. These can be
    
    456
    -included either as stand-alone text files, human-readable headers or
    
    457
    -in the appropriate machine-readable metadata fields within text or
    
    458
    -binary files as long as those fields can be easily viewed by the user.
    
    459
    -
    
    460
    -3) No Modified Version of the Font Software may use the Reserved Font
    
    461
    -Name(s) unless explicit written permission is granted by the corresponding
    
    462
    -Copyright Holder. This restriction only applies to the primary font name as
    
    463
    -presented to the users.
    
    464
    -
    
    465
    -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
    
    466
    -Software shall not be used to promote, endorse or advertise any
    
    467
    -Modified Version, except to acknowledge the contribution(s) of the
    
    468
    -Copyright Holder(s) and the Author(s) or with their explicit written
    
    469
    -permission.
    
    470
    -
    
    471
    -5) The Font Software, modified or unmodified, in part or in whole,
    
    472
    -must be distributed entirely under this license, and must not be
    
    473
    -distributed under any other license. The requirement for fonts to
    
    474
    -remain under this license does not apply to any document created
    
    475
    -using the Font Software.
    
    476
    -TERMINATION
    
    477
    -
    
    478
    -This license becomes null and void if any of the above conditions are
    
    479
    -not met.
    
    480
    -DISCLAIMER
    
    481
    -
    
    482
    -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
    
    483
    -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
    
    484
    -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
    
    485
    -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
    
    486
    -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
    
    487
    -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
    
    488
    -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    
    489
    -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
    
    490
    -OTHER DEALINGS IN THE FONT SOFTWARE.
    
    491
    -
    
    492
    -===============================================================================
    
    493
    -
    
    494
    -The Cousine font is licensed under the Apache License, Version 2.0.
    
    495
    -https://fonts.google.com/specimen/Cousine
    
    496
    -
    
    497
    -
    
    498
    -                                 Apache License
    
    499
    -                           Version 2.0, January 2004
    
    500
    -                        http://www.apache.org/licenses/
    
    501
    -
    
    502
    -   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    
    503
    -
    
    504
    -   1. Definitions.
    
    505
    -
    
    506
    -      "License" shall mean the terms and conditions for use, reproduction,
    
    507
    -      and distribution as defined by Sections 1 through 9 of this document.
    
    508
    -
    
    509
    -      "Licensor" shall mean the copyright owner or entity authorized by
    
    510
    -      the copyright owner that is granting the License.
    
    511
    -
    
    512
    -      "Legal Entity" shall mean the union of the acting entity and all
    
    513
    -      other entities that control, are controlled by, or are under common
    
    514
    -      control with that entity. For the purposes of this definition,
    
    515
    -      "control" means (i) the power, direct or indirect, to cause the
    
    516
    -      direction or management of such entity, whether by contract or
    
    517
    -      otherwise, or (ii) ownership of fifty percent (50%) or more of the
    
    518
    -      outstanding shares, or (iii) beneficial ownership of such entity.
    
    519
    -
    
    520
    -      "You" (or "Your") shall mean an individual or Legal Entity
    
    521
    -      exercising permissions granted by this License.
    
    522
    -
    
    523
    -      "Source" form shall mean the preferred form for making modifications,
    
    524
    -      including but not limited to software source code, documentation
    
    525
    -      source, and configuration files.
    
    526
    -
    
    527
    -      "Object" form shall mean any form resulting from mechanical
    
    528
    -      transformation or translation of a Source form, including but
    
    529
    -      not limited to compiled object code, generated documentation,
    
    530
    -      and conversions to other media types.
    
    531
    -
    
    532
    -      "Work" shall mean the work of authorship, whether in Source or
    
    533
    -      Object form, made available under the License, as indicated by a
    
    534
    -      copyright notice that is included in or attached to the work
    
    535
    -      (an example is provided in the Appendix below).
    
    536
    -
    
    537
    -      "Derivative Works" shall mean any work, whether in Source or Object
    
    538
    -      form, that is based on (or derived from) the Work and for which the
    
    539
    -      editorial revisions, annotations, elaborations, or other modifications
    
    540
    -      represent, as a whole, an original work of authorship. For the purposes
    
    541
    -      of this License, Derivative Works shall not include works that remain
    
    542
    -      separable from, or merely link (or bind by name) to the interfaces of,
    
    543
    -      the Work and Derivative Works thereof.
    
    544
    -
    
    545
    -      "Contribution" shall mean any work of authorship, including
    
    546
    -      the original version of the Work and any modifications or additions
    
    547
    -      to that Work or Derivative Works thereof, that is intentionally
    
    548
    -      submitted to Licensor for inclusion in the Work by the copyright owner
    
    549
    -      or by an individual or Legal Entity authorized to submit on behalf of
    
    550
    -      the copyright owner. For the purposes of this definition, "submitted"
    
    551
    -      means any form of electronic, verbal, or written communication sent
    
    552
    -      to the Licensor or its representatives, including but not limited to
    
    553
    -      communication on electronic mailing lists, source code control systems,
    
    554
    -      and issue tracking systems that are managed by, or on behalf of, the
    
    555
    -      Licensor for the purpose of discussing and improving the Work, but
    
    556
    -      excluding communication that is conspicuously marked or otherwise
    
    557
    -      designated in writing by the copyright owner as "Not a Contribution."
    
    558
    -
    
    559
    -      "Contributor" shall mean Licensor and any individual or Legal Entity
    
    560
    -      on behalf of whom a Contribution has been received by Licensor and
    
    561
    -      subsequently incorporated within the Work.
    
    562
    -
    
    563
    -   2. Grant of Copyright License. Subject to the terms and conditions of
    
    564
    -      this License, each Contributor hereby grants to You a perpetual,
    
    565
    -      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    
    566
    -      copyright license to reproduce, prepare Derivative Works of,
    
    567
    -      publicly display, publicly perform, sublicense, and distribute the
    
    568
    -      Work and such Derivative Works in Source or Object form.
    
    569
    -
    
    570
    -   3. Grant of Patent License. Subject to the terms and conditions of
    
    571
    -      this License, each Contributor hereby grants to You a perpetual,
    
    572
    -      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    
    573
    -      (except as stated in this section) patent license to make, have made,
    
    574
    -      use, offer to sell, sell, import, and otherwise transfer the Work,
    
    575
    -      where such license applies only to those patent claims licensable
    
    576
    -      by such Contributor that are necessarily infringed by their
    
    577
    -      Contribution(s) alone or by combination of their Contribution(s)
    
    578
    -      with the Work to which such Contribution(s) was submitted. If You
    
    579
    -      institute patent litigation against any entity (including a
    
    580
    -      cross-claim or counterclaim in a lawsuit) alleging that the Work
    
    581
    -      or a Contribution incorporated within the Work constitutes direct
    
    582
    -      or contributory patent infringement, then any patent licenses
    
    583
    -      granted to You under this License for that Work shall terminate
    
    584
    -      as of the date such litigation is filed.
    
    585
    -
    
    586
    -   4. Redistribution. You may reproduce and distribute copies of the
    
    587
    -      Work or Derivative Works thereof in any medium, with or without
    
    588
    -      modifications, and in Source or Object form, provided that You
    
    589
    -      meet the following conditions:
    
    590
    -
    
    591
    -      (a) You must give any other recipients of the Work or
    
    592
    -          Derivative Works a copy of this License; and
    
    593
    -
    
    594
    -      (b) You must cause any modified files to carry prominent notices
    
    595
    -          stating that You changed the files; and
    
    596
    -
    
    597
    -      (c) You must retain, in the Source form of any Derivative Works
    
    598
    -          that You distribute, all copyright, patent, trademark, and
    
    599
    -          attribution notices from the Source form of the Work,
    
    600
    -          excluding those notices that do not pertain to any part of
    
    601
    -          the Derivative Works; and
    
    602
    -
    
    603
    -      (d) If the Work includes a "NOTICE" text file as part of its
    
    604
    -          distribution, then any Derivative Works that You distribute must
    
    605
    -          include a readable copy of the attribution notices contained
    
    606
    -          within such NOTICE file, excluding those notices that do not
    
    607
    -          pertain to any part of the Derivative Works, in at least one
    
    608
    -          of the following places: within a NOTICE text file distributed
    
    609
    -          as part of the Derivative Works; within the Source form or
    
    610
    -          documentation, if provided along with the Derivative Works; or,
    
    611
    -          within a display generated by the Derivative Works, if and
    
    612
    -          wherever such third-party notices normally appear. The contents
    
    613
    -          of the NOTICE file are for informational purposes only and
    
    614
    -          do not modify the License. You may add Your own attribution
    
    615
    -          notices within Derivative Works that You distribute, alongside
    
    616
    -          or as an addendum to the NOTICE text from the Work, provided
    
    617
    -          that such additional attribution notices cannot be construed
    
    618
    -          as modifying the License.
    
    619
    -
    
    620
    -      You may add Your own copyright statement to Your modifications and
    
    621
    -      may provide additional or different license terms and conditions
    
    622
    -      for use, reproduction, or distribution of Your modifications, or
    
    623
    -      for any such Derivative Works as a whole, provided Your use,
    
    624
    -      reproduction, and distribution of the Work otherwise complies with
    
    625
    -      the conditions stated in this License.
    
    626
    -
    
    627
    -   5. Submission of Contributions. Unless You explicitly state otherwise,
    
    628
    -      any Contribution intentionally submitted for inclusion in the Work
    
    629
    -      by You to the Licensor shall be under the terms and conditions of
    
    630
    -      this License, without any additional terms or conditions.
    
    631
    -      Notwithstanding the above, nothing herein shall supersede or modify
    
    632
    -      the terms of any separate license agreement you may have executed
    
    633
    -      with Licensor regarding such Contributions.
    
    634
    -
    
    635
    -   6. Trademarks. This License does not grant permission to use the trade
    
    636
    -      names, trademarks, service marks, or product names of the Licensor,
    
    637
    -      except as required for reasonable and customary use in describing the
    
    638
    -      origin of the Work and reproducing the content of the NOTICE file.
    
    639
    -
    
    640
    -   7. Disclaimer of Warranty. Unless required by applicable law or
    
    641
    -      agreed to in writing, Licensor provides the Work (and each
    
    642
    -      Contributor provides its Contributions) on an "AS IS" BASIS,
    
    643
    -      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
    
    644
    -      implied, including, without limitation, any warranties or conditions
    
    645
    -      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
    
    646
    -      PARTICULAR PURPOSE. You are solely responsible for determining the
    
    647
    -      appropriateness of using or redistributing the Work and assume any
    
    648
    -      risks associated with Your exercise of permissions under this License.
    
    649
    -
    
    650
    -   8. Limitation of Liability. In no event and under no legal theory,
    
    651
    -      whether in tort (including negligence), contract, or otherwise,
    
    652
    -      unless required by applicable law (such as deliberate and grossly
    
    653
    -      negligent acts) or agreed to in writing, shall any Contributor be
    
    654
    -      liable to You for damages, including any direct, indirect, special,
    
    655
    -      incidental, or consequential damages of any character arising as a
    
    656
    -      result of this License or out of the use or inability to use the
    
    657
    -      Work (including but not limited to damages for loss of goodwill,
    
    658
    -      work stoppage, computer failure or malfunction, or any and all
    
    659
    -      other commercial damages or losses), even if such Contributor
    
    660
    -      has been advised of the possibility of such damages.
    
    661
    -
    
    662
    -   9. Accepting Warranty or Additional Liability. While redistributing
    
    663
    -      the Work or Derivative Works thereof, You may choose to offer,
    
    664
    -      and charge a fee for, acceptance of support, warranty, indemnity,
    
    665
    -      or other liability obligations and/or rights consistent with this
    
    666
    -      License. However, in accepting such obligations, You may act only
    
    667
    -      on Your own behalf and on Your sole responsibility, not on behalf
    
    668
    -      of any other Contributor, and only if You agree to indemnify,
    
    669
    -      defend, and hold each Contributor harmless for any liability
    
    670
    -      incurred by, or claims asserted against, such Contributor by reason
    
    671
    -      of your accepting any such warranty or additional liability.
    
    672
    -
    
    673
    -   END OF TERMS AND CONDITIONS
    
    674
    -
    
    675
    -   APPENDIX: How to apply the Apache License to your work.
    
    676
    -
    
    677
    -      To apply the Apache License to your work, attach the following
    
    678
    -      boilerplate notice, with the fields enclosed by brackets "[]"
    
    679
    -      replaced with your own identifying information. (Don't include
    
    680
    -      the brackets!)  The text should be enclosed in the appropriate
    
    681
    -      comment syntax for the file format. We also recommend that a
    
    682
    -      file or class name and description of purpose be included on the
    
    683
    -      same "printed page" as the copyright notice for easier
    
    684
    -      identification within third-party archives.
    
    685
    -
    
    686
    -   Copyright [yyyy] [name of copyright owner]
    
    687
    -
    
    688
    -   Licensed under the Apache License, Version 2.0 (the "License");
    
    689
    -   you may not use this file except in compliance with the License.
    
    690
    -   You may obtain a copy of the License at
    
    691
    -
    
    692
    -       http://www.apache.org/licenses/LICENSE-2.0
    
    693
    -
    
    694
    -   Unless required by applicable law or agreed to in writing, software
    
    695
    -   distributed under the License is distributed on an "AS IS" BASIS,
    
    696
    -   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    
    697
    -   See the License for the specific language governing permissions and
    
    698
    -   limitations under the License.

  • app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
    ... ... @@ -49,14 +49,10 @@ import com.google.android.material.snackbar.Snackbar
    49 49
     import kotlinx.android.synthetic.main.fragment_home.*
    
    50 50
     import kotlinx.android.synthetic.main.fragment_home.view.bottomBarShadow
    
    51 51
     import kotlinx.android.synthetic.main.fragment_home.view.bottom_bar
    
    52
    -import kotlinx.android.synthetic.main.fragment_home.view.donate_now_button
    
    53
    -import kotlinx.android.synthetic.main.fragment_home.view.donationmatch
    
    54 52
     import kotlinx.android.synthetic.main.fragment_home.view.exploreprivately
    
    55 53
     import kotlinx.android.synthetic.main.fragment_home.view.homeAppBar
    
    56
    -import kotlinx.android.synthetic.main.fragment_home.view.illo_image
    
    57 54
     import kotlinx.android.synthetic.main.fragment_home.view.menuButton
    
    58 55
     import kotlinx.android.synthetic.main.fragment_home.view.onion_pattern_image
    
    59
    -import kotlinx.android.synthetic.main.fragment_home.view.resistsurveillance
    
    60 56
     import kotlinx.android.synthetic.main.fragment_home.view.sessionControlRecyclerView
    
    61 57
     import kotlinx.android.synthetic.main.fragment_home.view.tab_button
    
    62 58
     import kotlinx.android.synthetic.main.fragment_home.view.toolbar
    
    ... ... @@ -90,7 +86,6 @@ import mozilla.components.lib.state.ext.consumeFrom
    90 86
     import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
    
    91 87
     import mozilla.components.support.ktx.android.content.res.resolveAttribute
    
    92 88
     import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
    
    93
    -import mozilla.components.support.locale.LocaleManager
    
    94 89
     import mozilla.components.ui.tabcounter.TabCounterMenu
    
    95 90
     import org.mozilla.fenix.BrowserDirection
    
    96 91
     import org.mozilla.fenix.BuildConfig
    
    ... ... @@ -119,7 +114,6 @@ import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionViewHolder
    119 114
     import org.mozilla.fenix.home.sessioncontrol.viewholders.topsites.DefaultTopSitesView
    
    120 115
     import org.mozilla.fenix.onboarding.FenixOnboarding
    
    121 116
     import org.mozilla.fenix.settings.SupportUtils
    
    122
    -import org.mozilla.fenix.settings.advanced.getSelectedLocale
    
    123 117
     import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit
    
    124 118
     import org.mozilla.fenix.tor.bootstrap.TorQuickStart
    
    125 119
     import org.mozilla.fenix.theme.ThemeManager
    
    ... ... @@ -284,28 +278,6 @@ class HomeFragment : Fragment() {
    284 278
             adjustHomeFragmentView(currentMode.getCurrentMode(), view)
    
    285 279
             showSessionControlView(view)
    
    286 280
     
    
    287
    -        view.donationmatch.setOnClickListener {
    
    288
    -            activity.openToBrowserAndLoad(
    
    289
    -                searchTermOrURL = "https://blog.torproject.org/friends-of-tor-match-2020",
    
    290
    -                newTab = true,
    
    291
    -                from = BrowserDirection.FromHome
    
    292
    -            )
    
    293
    -        }
    
    294
    -
    
    295
    -        view.donate_now_button.setOnClickListener {
    
    296
    -            val country = LocaleManager.getSelectedLocale(requireContext()).country
    
    297
    -            var locale = LocaleManager.getSelectedLocale(requireContext()).language
    
    298
    -            if (country != "") {
    
    299
    -                locale = "$locale-$country"
    
    300
    -            }
    
    301
    -            val localeUrl = "https://www.torproject.org/donate/donate-usetor-mobile-$locale"
    
    302
    -            activity.openToBrowserAndLoad(
    
    303
    -                searchTermOrURL = localeUrl,
    
    304
    -                newTab = true,
    
    305
    -                from = BrowserDirection.FromHome
    
    306
    -            )
    
    307
    -        }
    
    308
    -
    
    309 281
             return view
    
    310 282
         }
    
    311 283
     
    
    ... ... @@ -437,14 +409,6 @@ class HomeFragment : Fragment() {
    437 409
                                     toolbarLayoutHeight - SESSION_CONTROL_VIEW_PADDING
    
    438 410
                                 )
    
    439 411
                             }
    
    440
    -                        view.donate_now_button?.apply {
    
    441
    -                            (layoutParams as ViewGroup.MarginLayoutParams).setMargins(
    
    442
    -                                0,
    
    443
    -                                0,
    
    444
    -                                0,
    
    445
    -                                toolbarLayoutHeight - SESSION_CONTROL_VIEW_PADDING
    
    446
    -                            )
    
    447
    -                        }
    
    448 412
                         }
    
    449 413
                     } else {
    
    450 414
                         view.sessionControlRecyclerView?.apply {
    
    ... ... @@ -455,38 +419,6 @@ class HomeFragment : Fragment() {
    455 419
                                 height - SESSION_CONTROL_VIEW_PADDING
    
    456 420
                             )
    
    457 421
                         }
    
    458
    -                    view.donate_now_button?.apply {
    
    459
    -                        (layoutParams as ViewGroup.MarginLayoutParams).setMargins(
    
    460
    -                            0,
    
    461
    -                            0,
    
    462
    -                            0,
    
    463
    -                            height - SESSION_CONTROL_VIEW_PADDING
    
    464
    -                        )
    
    465
    -                    }
    
    466
    -                }
    
    467
    -            }
    
    468
    -
    
    469
    -            // Hide the EOY image during Onboarding, too.
    
    470
    -            view?.illo_image?.apply {
    
    471
    -                visibility = if (onboarding.userHasBeenOnboarded()) {
    
    472
    -                    View.VISIBLE
    
    473
    -                } else {
    
    474
    -                    View.GONE
    
    475
    -                }
    
    476
    -            }
    
    477
    -            // Hide the EOY donate button during Onboarding, too.
    
    478
    -            view?.donate_now_button?.apply {
    
    479
    -                visibility = if (onboarding.userHasBeenOnboarded()) {
    
    480
    -                    View.VISIBLE
    
    481
    -                } else {
    
    482
    -                    View.GONE
    
    483
    -                }
    
    484
    -            }
    
    485
    -            view?.resistsurveillance?.apply {
    
    486
    -                visibility = if (onboarding.userHasBeenOnboarded()) {
    
    487
    -                    View.VISIBLE
    
    488
    -                } else {
    
    489
    -                    View.GONE
    
    490 422
                     }
    
    491 423
                 }
    
    492 424
                 // Hide the onion pattern during Onboarding, too.
    

  • app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt
    ... ... @@ -32,7 +32,7 @@ abstract class ThemeManager {
    32 32
         @get:StyleRes
    
    33 33
         val currentThemeResource get() = when (currentTheme) {
    
    34 34
             BrowsingMode.Normal -> R.style.NormalTheme
    
    35
    -        BrowsingMode.Private -> R.style.PrivateEOYTheme
    
    35
    +        BrowsingMode.Private -> R.style.PrivateTheme
    
    36 36
         }
    
    37 37
     
    
    38 38
         /**
    

  • app/src/main/res/drawable/ic_illo.png deleted
    No preview for this file type
  • app/src/main/res/drawable/ic_tape.png deleted
    No preview for this file type
  • app/src/main/res/font/cousine.ttf deleted
    No preview for this file type
  • app/src/main/res/font/terminal_grotesque.otf deleted
    No preview for this file type
  • app/src/main/res/font/white_on_black.ttf deleted
    No preview for this file type
  • app/src/main/res/layout/fragment_home.xml
    ... ... @@ -53,7 +53,6 @@
    53 53
                     android:clickable="false"
    
    54 54
                     android:contentDescription="@string/app_name"
    
    55 55
                     android:focusable="false"
    
    56
    -                android:visibility="gone"
    
    57 56
                     android:importantForAccessibility="no"
    
    58 57
                     app:srcCompat="@mipmap/ic_launcher"
    
    59 58
                     app:layout_collapseMode="parallax"
    
    ... ... @@ -70,7 +69,6 @@
    70 69
                     android:height="60dp"
    
    71 70
                     android:clickable="false"
    
    72 71
                     android:focusable="false"
    
    73
    -                android:visibility="gone"
    
    74 72
                     android:importantForAccessibility="no"
    
    75 73
                     android:lines="2"
    
    76 74
                     android:text="@string/app_name"
    
    ... ... @@ -85,99 +83,19 @@
    85 83
                 android:id="@+id/exploreprivately"
    
    86 84
                 android:layout_width="wrap_content"
    
    87 85
                 android:layout_height="wrap_content"
    
    88
    -            android:layout_gravity="center_vertical"
    
    89
    -            android:layout_marginStart="30dp"
    
    90
    -            android:layout_marginEnd="30dp"
    
    86
    +            android:layout_gravity="center|center_vertical"
    
    87
    +            android:gravity="center_horizontal"
    
    91 88
                 android:clickable="false"
    
    92 89
                 android:ellipsize="end"
    
    93 90
                 android:focusable="false"
    
    94 91
                 android:importantForAccessibility="no"
    
    95
    -            android:text="@string/tor_useamask_usetor"
    
    96
    -            android:fontFamily="@font/white_on_black"
    
    97
    -            android:textColor="#FFFFFFFF"
    
    92
    +            android:text="@string/tor_explore_privately"
    
    93
    +            android:fontFamily="Roboto-Medium"
    
    94
    +            android:textColor="#DEFFFFFF"
    
    98 95
                 android:textSize="40sp"
    
    99
    -            android:paddingTop="20dp"
    
    100 96
                 android:lineSpacingMultiplier="1.1"
    
    101 97
                 app:layout_scrollFlags="scroll" />
    
    102 98
     
    
    103
    -        <LinearLayout
    
    104
    -            android:layout_width="match_parent"
    
    105
    -            android:layout_height="wrap_content">
    
    106
    -
    
    107
    -            <LinearLayout
    
    108
    -                android:layout_width="match_parent"
    
    109
    -                android:layout_height="wrap_content"
    
    110
    -                android:layout_weight="1"
    
    111
    -                android:orientation="vertical">
    
    112
    -
    
    113
    -                <TextView
    
    114
    -                    android:id="@+id/resistsurveillance"
    
    115
    -                    android:layout_width="wrap_content"
    
    116
    -                    android:layout_height="wrap_content"
    
    117
    -                    android:layout_marginStart="40dp"
    
    118
    -                    android:layout_gravity="center_vertical"
    
    119
    -                    android:clickable="false"
    
    120
    -                    android:focusable="false"
    
    121
    -                    android:gravity="start"
    
    122
    -                    android:fontFamily="@font/terminal_grotesque"
    
    123
    -                    android:importantForAccessibility="no"
    
    124
    -                    android:lineSpacingMultiplier="1.1"
    
    125
    -                    android:text="@string/tor_resistsurveillance"
    
    126
    -                    android:textColor="#FFFFFFFF"
    
    127
    -                    android:textSize="27sp"
    
    128
    -                    android:visibility="visible"
    
    129
    -                    app:layout_scrollFlags="scroll" />
    
    130
    -
    
    131
    -                <TextView
    
    132
    -                    android:id="@+id/donationmatch"
    
    133
    -                    android:layout_width="wrap_content"
    
    134
    -                    android:layout_height="wrap_content"
    
    135
    -                    android:layout_marginStart="40dp"
    
    136
    -                    android:layout_gravity="center_vertical"
    
    137
    -                    android:paddingTop="20dp"
    
    138
    -                    android:paddingBottom="20dp"
    
    139
    -                    android:clickable="false"
    
    140
    -                    android:focusable="false"
    
    141
    -                    android:gravity="start"
    
    142
    -                    android:fontFamily="@font/cousine"
    
    143
    -                    android:importantForAccessibility="no"
    
    144
    -                    android:lineSpacingMultiplier="1.1"
    
    145
    -                    android:text="@string/tor_donationmatch"
    
    146
    -                    android:textColor="#9D4AE8"
    
    147
    -                    android:textSize="14sp"
    
    148
    -                    android:visibility="visible"
    
    149
    -                    app:layout_scrollFlags="scroll" />
    
    150
    -
    
    151
    -                <Button
    
    152
    -                    android:id="@+id/donate_now_button"
    
    153
    -                    android:layout_width="wrap_content"
    
    154
    -                    android:layout_height="wrap_content"
    
    155
    -                    android:layout_marginStart="30dp"
    
    156
    -                    android:background="@drawable/ic_tape"
    
    157
    -                    android:gravity="center|start"
    
    158
    -                    android:fontFamily="@font/terminal_grotesque"
    
    159
    -                    android:paddingStart="15dp"
    
    160
    -                    android:paddingEnd="20dp"
    
    161
    -                    android:text="@string/tor_onboarding_donate_button"
    
    162
    -                    android:textColor="#FF000000"
    
    163
    -                    android:textSize="25sp"
    
    164
    -                    android:textAllCaps="false"
    
    165
    -                    android:textStyle="bold"
    
    166
    -                    android:visibility="visible"
    
    167
    -                    tools:ignore="ButtonStyleXmlDetector" />
    
    168
    -            </LinearLayout>
    
    169
    -
    
    170
    -            <ImageView
    
    171
    -                android:id="@+id/illo_image"
    
    172
    -                android:layout_width="match_parent"
    
    173
    -                android:layout_height="wrap_content"
    
    174
    -                android:layout_weight="1"
    
    175
    -                app:srcCompat="@drawable/ic_illo"
    
    176
    -                tools:ignore="ContentDescription"
    
    177
    -                app:layout_scrollFlags="scroll" />
    
    178
    -
    
    179
    -        </LinearLayout>
    
    180
    -
    
    181 99
         </com.google.android.material.appbar.AppBarLayout>
    
    182 100
     
    
    183 101
         <androidx.recyclerview.widget.RecyclerView
    

  • app/src/main/res/values/styles.xml
    ... ... @@ -269,10 +269,6 @@
    269 269
     
    
    270 270
         <style name="PrivateTheme" parent="PrivateThemeBase" />
    
    271 271
     
    
    272
    -    <style name="PrivateEOYTheme" parent="PrivateThemeBase" >
    
    273
    -        <item name="homeBackground">@android:color/black</item>
    
    274
    -    </style>
    
    275
    -
    
    276 272
         <!-- Fade animation for theme switching -->
    
    277 273
         <style name="WindowAnimationTransition">
    
    278 274
             <item name="android:windowEnterAnimation">@anim/fade_in</item>
    

  • app/src/main/res/values/torbrowser_strings.xml
    ... ... @@ -72,8 +72,4 @@
    72 72
     
    
    73 73
         <!-- Spoof locale to English -->
    
    74 74
         <string name="tor_spoof_english">Request English versions of web pages for enhanced privacy</string>
    
    75
    -
    
    76
    -    <string name="tor_useamask_usetor">Use a mask, use Tor.</string>
    
    77
    -    <string name="tor_resistsurveillance">Resist the surveillance pandemic.</string>
    
    78
    -    <string name="tor_donationmatch">Your donation will be matched by Friends of Tor.</string>
    
    79 75
     </resources>