[tor-commits] [Git][tpo/applications/fenix][tor-browser-82.1.1-10.0-1] 2 commits: Bug 40098 - Add EOY home screen
Matthew Finkel
gitlab at torproject.org
Fri Oct 30 14:54:06 UTC 2020
Matthew Finkel pushed to branch tor-browser-82.1.1-10.0-1 at The Tor Project / Applications / fenix
Commits:
879a452f by Matthew Finkel at 2020-10-30T03:15:39+00:00
Bug 40098 - Add EOY home screen
- - - - -
35e95977 by Matthew Finkel at 2020-10-30T14:52:50+00:00
Merge commit '879a452f8af6a61cef73a8b4fd362ae8f70dafd0' into tor-browser-82.1.1-10.0-1
- - - - -
10 changed files:
- LICENSE
- 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_illo.png
- + app/src/main/res/drawable/ic_tape.png
- + app/src/main/res/font/terminal_grotesque.otf
- + app/src/main/res/font/white_on_black.ttf
- app/src/main/res/layout/fragment_home.xml
- app/src/main/res/values/styles.xml
- app/src/main/res/values/torbrowser_strings.xml
Changes:
=====================================
LICENSE
=====================================
@@ -371,3 +371,120 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
This Source Code Form is "Incompatible With Secondary Licenses", as
defined by the Mozilla Public License, v. 2.0.
+
+===============================================================================
+
+"White On Black" font embedded in chrome/skin/aboutTorFonts.css is licensed under:
+
+Non Exclusive License Agreement
+
+Object: Imagex font called « White on Black »
+Owner: Daniel Hochard
+
+1. Allowed uses
+The user may use this font on any surface such as logo, paper, web sites,
+textile, Online medias, except TV, cinéma and advertising campaign.
+2. Number of users : 5
+All users must belong to the same company or household purchasing the font.
+3. Modifications
+The user can modify this font itself without written consent of the owner.
+4. This font belongs to Daniel Hochard. The user may not sell it as a font (in a
+font bank or a commercial fonts web site, for example).
+The fee for this font was paid on paypal the 29 september 2020
+
+===============================================================================
+
+"Terminal Grotesque Open" font embedded in chrome/skin/aboutTorFonts.css is licensed
+under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+===============================================================================
+
+SIL OPEN FONT LICENSE
+
+Version 1.1 - 26 February 2007
+
+PREAMBLE
+
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+DEFINITIONS
+
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting — in part or in whole — any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+PERMISSION & CONDITIONS
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+TERMINATION
+
+This license becomes null and void if any of the above conditions are
+not met.
+DISCLAIMER
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
=====================================
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
=====================================
@@ -74,6 +74,7 @@ import mozilla.components.feature.top.sites.TopSitesFeature
import mozilla.components.lib.state.ext.consumeFrom
import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
import mozilla.components.support.ktx.android.content.res.resolveAttribute
+import mozilla.components.support.locale.LocaleManager
import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.BuildConfig
import org.mozilla.fenix.FeatureFlags
@@ -105,6 +106,7 @@ import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionViewHolder
import org.mozilla.fenix.home.sessioncontrol.viewholders.topsites.DefaultTopSitesView
import org.mozilla.fenix.onboarding.FenixOnboarding
import org.mozilla.fenix.settings.SupportUtils
+import org.mozilla.fenix.settings.advanced.getSelectedLocale
import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit
import org.mozilla.fenix.tor.bootstrap.TorQuickStart
import org.mozilla.fenix.theme.ThemeManager
@@ -270,6 +272,20 @@ class HomeFragment : Fragment() {
adjustHomeFragmentView(currentMode.getCurrentMode(), view)
showSessionControlView(view)
+ view.donate_now_button.setOnClickListener {
+ val country = LocaleManager.getSelectedLocale(requireContext()).country
+ var locale = LocaleManager.getSelectedLocale(requireContext()).language
+ if (country != "") {
+ locale = "${locale}-${country}"
+ }
+ val localeUrl = "https://www.torproject.org/donate/donate-usetor-mobile-${locale}"
+ activity.openToBrowserAndLoad(
+ searchTermOrURL = localeUrl,
+ newTab = true,
+ from = BrowserDirection.FromHome
+ )
+ }
+
return view
}
@@ -401,6 +417,14 @@ class HomeFragment : Fragment() {
toolbarLayoutHeight - SESSION_CONTROL_VIEW_PADDING
)
}
+ view.donate_now_button?.apply {
+ (layoutParams as ViewGroup.MarginLayoutParams).setMargins(
+ 0,
+ 0,
+ 0,
+ toolbarLayoutHeight - SESSION_CONTROL_VIEW_PADDING
+ )
+ }
}
} else {
view.sessionControlRecyclerView?.apply {
@@ -411,6 +435,38 @@ class HomeFragment : Fragment() {
height - SESSION_CONTROL_VIEW_PADDING
)
}
+ view.donate_now_button?.apply {
+ (layoutParams as ViewGroup.MarginLayoutParams).setMargins(
+ 0,
+ 0,
+ 0,
+ height - SESSION_CONTROL_VIEW_PADDING
+ )
+ }
+ }
+ }
+
+ // Hide the EOY image during Onboarding, too.
+ view?.illo_image?.apply {
+ visibility = if (onboarding.userHasBeenOnboarded()) {
+ View.VISIBLE
+ } else {
+ View.GONE
+ }
+ }
+ // Hide the EOY donate button during Onboarding, too.
+ view?.donate_now_button?.apply {
+ visibility = if (onboarding.userHasBeenOnboarded()) {
+ View.VISIBLE
+ } else {
+ View.GONE
+ }
+ }
+ view?.resistsurveillance?.apply {
+ visibility = if (onboarding.userHasBeenOnboarded()) {
+ View.VISIBLE
+ } else {
+ View.GONE
}
}
// Hide the onion pattern during Onboarding, too.
=====================================
app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt
=====================================
@@ -32,7 +32,7 @@ abstract class ThemeManager {
@get:StyleRes
val currentThemeResource get() = when (currentTheme) {
BrowsingMode.Normal -> R.style.NormalTheme
- BrowsingMode.Private -> R.style.PrivateTheme
+ BrowsingMode.Private -> R.style.PrivateEOYTheme
}
/**
=====================================
app/src/main/res/drawable/ic_illo.png
=====================================
Binary files /dev/null and b/app/src/main/res/drawable/ic_illo.png differ
=====================================
app/src/main/res/drawable/ic_tape.png
=====================================
Binary files /dev/null and b/app/src/main/res/drawable/ic_tape.png differ
=====================================
app/src/main/res/font/terminal_grotesque.otf
=====================================
Binary files /dev/null and b/app/src/main/res/font/terminal_grotesque.otf differ
=====================================
app/src/main/res/font/white_on_black.ttf
=====================================
Binary files /dev/null and b/app/src/main/res/font/white_on_black.ttf differ
=====================================
app/src/main/res/layout/fragment_home.xml
=====================================
@@ -53,6 +53,7 @@
android:clickable="false"
android:contentDescription="@string/app_name"
android:focusable="false"
+ android:visibility="gone"
android:importantForAccessibility="no"
app:srcCompat="@mipmap/ic_launcher"
app:layout_collapseMode="parallax"
@@ -69,6 +70,7 @@
android:height="60dp"
android:clickable="false"
android:focusable="false"
+ android:visibility="gone"
android:importantForAccessibility="no"
android:lines="2"
android:text="@string/app_name"
@@ -83,19 +85,79 @@
android:id="@+id/exploreprivately"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center|center_vertical"
- android:gravity="center_horizontal"
+ android:layout_gravity="center_vertical"
+ android:layout_marginStart="30dp"
+ android:layout_marginEnd="30dp"
android:clickable="false"
android:ellipsize="end"
android:focusable="false"
android:importantForAccessibility="no"
- android:text="@string/tor_explore_privately"
- android:fontFamily="Roboto-Medium"
- android:textColor="#DEFFFFFF"
+ android:text="@string/tor_useamask_usetor"
+ android:fontFamily="@font/white_on_black"
+ android:textColor="#FFFFFFFF"
android:textSize="40sp"
+ android:paddingTop="20dp"
android:lineSpacingMultiplier="1.1"
app:layout_scrollFlags="scroll" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/resistsurveillance"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="40dp"
+ android:layout_gravity="center_vertical"
+ android:clickable="false"
+ android:focusable="false"
+ android:gravity="start"
+ android:fontFamily="@font/terminal_grotesque"
+ android:importantForAccessibility="no"
+ android:lineSpacingMultiplier="1.1"
+ android:text="@string/tor_resistsurveillance"
+ android:textColor="#FFFFFFFF"
+ android:textSize="25sp"
+ android:visibility="visible"
+ app:layout_scrollFlags="scroll" />
+
+ <Button
+ android:id="@+id/donate_now_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="30dp"
+ android:background="@drawable/ic_tape"
+ android:gravity="center|start"
+ android:fontFamily="@font/terminal_grotesque"
+ android:paddingStart="15dp"
+ android:paddingEnd="20dp"
+ android:text="@string/tor_onboarding_donate_button"
+ android:textColor="#FF000000"
+ android:textSize="25sp"
+ android:textAllCaps="false"
+ android:textStyle="bold"
+ android:visibility="visible"
+ tools:ignore="ButtonStyleXmlDetector" />
+ </LinearLayout>
+
+ <ImageView
+ android:id="@+id/illo_image"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ app:srcCompat="@drawable/ic_illo"
+ tools:ignore="ContentDescription"
+ app:layout_scrollFlags="scroll" />
+
+ </LinearLayout>
+
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
=====================================
app/src/main/res/values/styles.xml
=====================================
@@ -269,6 +269,10 @@
<style name="PrivateTheme" parent="PrivateThemeBase" />
+ <style name="PrivateEOYTheme" parent="PrivateThemeBase" >
+ <item name="homeBackground">@android:color/black</item>
+ </style>
+
<!-- Fade animation for theme switching -->
<style name="WindowAnimationTransition">
<item name="android:windowEnterAnimation">@anim/fade_in</item>
=====================================
app/src/main/res/values/torbrowser_strings.xml
=====================================
@@ -72,4 +72,7 @@
<!-- Spoof locale to English -->
<string name="tor_spoof_english">Request English versions of web pages for enhanced privacy</string>
+
+ <string name="tor_useamask_usetor">Use a mask. Use Tor.</string>
+ <string name="tor_resistsurveillance">Resist the surveillance pandemic.</string>
</resources>
View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/b30df1e9dab97d53260a6008e487387eaf8fbdcb...35e959772b2ef0402443961d0bb4153affeae598
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/b30df1e9dab97d53260a6008e487387eaf8fbdcb...35e959772b2ef0402443961d0bb4153affeae598
You're receiving this email because of your account on gitlab.torproject.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20201030/e7e415fd/attachment-0001.htm>
More information about the tor-commits
mailing list