GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit 94fbc28d authored by Matthew Finkel's avatar Matthew Finkel

Bug 40073: Use correct branding on About page

parent 57b8e341
...@@ -107,8 +107,8 @@ private fun assertVersionNumber() { ...@@ -107,8 +107,8 @@ private fun assertVersionNumber() {
} }
private fun assertProductCompany() { private fun assertProductCompany() {
onView(withId(R.id.about_content)) onView(withId(R.id.tor_about_content))
.check(matches(withText(containsString("Firefox Preview is produced by Mozilla.")))) .check(matches(withText(containsString("Firefox Preview is produced by the Tor Project."))))
} }
private fun assertCurrentTimestamp() { private fun assertCurrentTimestamp() {
......
...@@ -17,7 +17,6 @@ import androidx.recyclerview.widget.DividerItemDecoration ...@@ -17,7 +17,6 @@ import androidx.recyclerview.widget.DividerItemDecoration
import kotlinx.android.synthetic.main.fragment_about.* import kotlinx.android.synthetic.main.fragment_about.*
import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.BuildConfig
import org.mozilla.fenix.Config
import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.Event
...@@ -50,8 +49,7 @@ class AboutFragment : Fragment(), AboutPageListener { ...@@ -50,8 +49,7 @@ class AboutFragment : Fragment(), AboutPageListener {
): View? { ): View? {
val rootView = inflater.inflate(R.layout.fragment_about, container, false) val rootView = inflater.inflate(R.layout.fragment_about, container, false)
appName = getString(R.string.app_name) appName = getString(R.string.app_name)
headerAppName = headerAppName = appName
if (Config.channel.isRelease) getString(R.string.daylight_app_name) else appName
activity?.title = getString(R.string.preferences_about, appName) activity?.title = getString(R.string.preferences_about, appName)
return rootView return rootView
...@@ -117,7 +115,7 @@ class AboutFragment : Fragment(), AboutPageListener { ...@@ -117,7 +115,7 @@ class AboutFragment : Fragment(), AboutPageListener {
"" ""
} }
val content = getString(R.string.about_content, headerAppName) val content = getString(R.string.tor_about_content, headerAppName)
val buildDate = BuildConfig.BUILD_DATE val buildDate = BuildConfig.BUILD_DATE
about_text.text = aboutText about_text.text = aboutText
......
...@@ -19,18 +19,32 @@ ...@@ -19,18 +19,32 @@
<ImageView <ImageView
android:id="@+id/wordmark" android:id="@+id/wordmark"
android:layout_width="0dp" android:layout_width="75dp"
android:layout_height="@dimen/about_header_fenix_logo_height" android:layout_height="75dp"
android:layout_marginStart="@dimen/about_header_icon_margin_start_end"
android:layout_marginTop="@dimen/about_header_icon_margin_top" android:layout_marginTop="@dimen/about_header_icon_margin_top"
android:layout_marginEnd="@dimen/about_header_icon_margin_start_end" android:layout_marginEnd="130dp"
android:contentDescription="@string/app_name" android:contentDescription="@string/app_name"
android:importantForAccessibility="no" android:importantForAccessibility="no"
app:srcCompat="?fenixLogo" app:srcCompat="@mipmap/ic_launcher"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/app_name"
style="@style/Header24TextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/about_header_icon_margin_top"
android:gravity="center_vertical"
android:width="130dp"
android:height="70dp"
android:lines="2"
android:text="@string/app_name"
android:textSize="20sp"
android:lineSpacingMultiplier="1.2"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent="0.75" /> app:layout_constraintStart_toEndOf="@id/wordmark" />
<TextView <TextView
android:id="@+id/about_content" android:id="@+id/about_content"
...@@ -45,7 +59,7 @@ ...@@ -45,7 +59,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/wordmark" app:layout_constraintTop_toBottomOf="@id/wordmark"
app:layout_constraintWidth_percent="0.8" app:layout_constraintWidth_percent="0.8"
tools:text="@string/about_content" /> tools:text="@string/tor_about_content" />
<TextView <TextView
android:id="@+id/about_text" android:id="@+id/about_text"
......
...@@ -390,6 +390,12 @@ ...@@ -390,6 +390,12 @@
<item name="fontFamily">@font/metropolis_semibold</item> <item name="fontFamily">@font/metropolis_semibold</item>
</style> </style>
<style name="Header24TextStyle" parent="TextAppearance.MaterialComponents.Body1">
<item name="android:textColor">?primaryText</item>
<item name="android:textSize">24sp</item>
<item name="fontFamily">@font/metropolis_semibold</item>
</style>
<style name="Header16TextStyle" parent="TextAppearance.MaterialComponents.Body1"> <style name="Header16TextStyle" parent="TextAppearance.MaterialComponents.Body1">
<item name="android:textColor">?primaryText</item> <item name="android:textColor">?primaryText</item>
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
......
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<resources> <resources>
<!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
<string name="tor_about_content">%1$s is produced by the Tor Project, a U.S.-based 501(c)(3) nonprofit.</string>
<!-- Preference for enabling non-Private Browsing Mode--> <!-- Preference for enabling non-Private Browsing Mode-->
<string name="preferences_disable_normal_mode">Allow Only Private Browsing Mode</string> <string name="preferences_disable_normal_mode">Allow Only Private Browsing Mode</string>
<!-- Preference link to donate to The Tor Project--> <!-- Preference link to donate to The Tor Project-->
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment