Matthew Finkel pushed to branch tor-browser-82.0.0b4-10.0-1 at The Tor Project / Applications / fenix
Commits:
-
cfb56207
by Matthew Finkel at 2020-10-16T19:13:59+00:00
-
77e2f0c7
by Matthew Finkel at 2020-10-16T22:28:11+00:00
5 changed files:
- app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt
- app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt
- app/src/main/res/layout/fragment_about.xml
- app/src/main/res/values/styles.xml
- app/src/main/res/values/torbrowser_strings.xml
Changes:
| ... | ... | @@ -107,8 +107,8 @@ private fun assertVersionNumber() { |
| 107 | 107 |
}
|
| 108 | 108 |
|
| 109 | 109 |
private fun assertProductCompany() {
|
| 110 |
- onView(withId(R.id.about_content))
|
|
| 111 |
- .check(matches(withText(containsString("Firefox Preview is produced by Mozilla."))))
|
|
| 110 |
+ onView(withId(R.id.tor_about_content))
|
|
| 111 |
+ .check(matches(withText(containsString("Firefox Preview is produced by the Tor Project."))))
|
|
| 112 | 112 |
}
|
| 113 | 113 |
|
| 114 | 114 |
private fun assertCurrentTimestamp() {
|
| ... | ... | @@ -17,7 +17,6 @@ import androidx.recyclerview.widget.DividerItemDecoration |
| 17 | 17 |
import kotlinx.android.synthetic.main.fragment_about.*
|
| 18 | 18 |
import org.mozilla.fenix.BrowserDirection
|
| 19 | 19 |
import org.mozilla.fenix.BuildConfig
|
| 20 |
-import org.mozilla.fenix.Config
|
|
| 21 | 20 |
import org.mozilla.fenix.HomeActivity
|
| 22 | 21 |
import org.mozilla.fenix.R
|
| 23 | 22 |
import org.mozilla.fenix.components.metrics.Event
|
| ... | ... | @@ -50,8 +49,7 @@ class AboutFragment : Fragment(), AboutPageListener { |
| 50 | 49 |
): View? {
|
| 51 | 50 |
val rootView = inflater.inflate(R.layout.fragment_about, container, false)
|
| 52 | 51 |
appName = getString(R.string.app_name)
|
| 53 |
- headerAppName =
|
|
| 54 |
- if (Config.channel.isRelease) getString(R.string.daylight_app_name) else appName
|
|
| 52 |
+ headerAppName = appName
|
|
| 55 | 53 |
activity?.title = getString(R.string.preferences_about, appName)
|
| 56 | 54 |
|
| 57 | 55 |
return rootView
|
| ... | ... | @@ -117,7 +115,7 @@ class AboutFragment : Fragment(), AboutPageListener { |
| 117 | 115 |
""
|
| 118 | 116 |
}
|
| 119 | 117 |
|
| 120 |
- val content = getString(R.string.about_content, headerAppName)
|
|
| 118 |
+ val content = getString(R.string.tor_about_content, headerAppName)
|
|
| 121 | 119 |
val buildDate = BuildConfig.BUILD_DATE
|
| 122 | 120 |
|
| 123 | 121 |
about_text.text = aboutText
|
| ... | ... | @@ -19,18 +19,32 @@ |
| 19 | 19 |
|
| 20 | 20 |
<ImageView
|
| 21 | 21 |
android:id="@+id/wordmark"
|
| 22 |
- android:layout_width="0dp"
|
|
| 23 |
- android:layout_height="@dimen/about_header_fenix_logo_height"
|
|
| 24 |
- android:layout_marginStart="@dimen/about_header_icon_margin_start_end"
|
|
| 22 |
+ android:layout_width="75dp"
|
|
| 23 |
+ android:layout_height="75dp"
|
|
| 25 | 24 |
android:layout_marginTop="@dimen/about_header_icon_margin_top"
|
| 26 |
- android:layout_marginEnd="@dimen/about_header_icon_margin_start_end"
|
|
| 25 |
+ android:layout_marginEnd="130dp"
|
|
| 27 | 26 |
android:contentDescription="@string/app_name"
|
| 28 | 27 |
android:importantForAccessibility="no"
|
| 29 |
- app:srcCompat="?fenixLogo"
|
|
| 30 |
- app:layout_constraintEnd_toEndOf="parent"
|
|
| 28 |
+ app:srcCompat="@mipmap/ic_launcher"
|
|
| 31 | 29 |
app:layout_constraintStart_toStartOf="parent"
|
| 30 |
+ app:layout_constraintEnd_toEndOf="parent"
|
|
| 31 |
+ app:layout_constraintTop_toTopOf="parent" />
|
|
| 32 |
+ |
|
| 33 |
+ <TextView
|
|
| 34 |
+ android:id="@+id/app_name"
|
|
| 35 |
+ style="@style/Header24TextStyle"
|
|
| 36 |
+ android:layout_width="wrap_content"
|
|
| 37 |
+ android:layout_height="wrap_content"
|
|
| 38 |
+ android:layout_marginTop="@dimen/about_header_icon_margin_top"
|
|
| 39 |
+ android:gravity="center_vertical"
|
|
| 40 |
+ android:width="130dp"
|
|
| 41 |
+ android:height="70dp"
|
|
| 42 |
+ android:lines="2"
|
|
| 43 |
+ android:text="@string/app_name"
|
|
| 44 |
+ android:textSize="20sp"
|
|
| 45 |
+ android:lineSpacingMultiplier="1.2"
|
|
| 32 | 46 |
app:layout_constraintTop_toTopOf="parent"
|
| 33 |
- app:layout_constraintWidth_percent="0.75" />
|
|
| 47 |
+ app:layout_constraintStart_toEndOf="@id/wordmark" />
|
|
| 34 | 48 |
|
| 35 | 49 |
<TextView
|
| 36 | 50 |
android:id="@+id/about_content"
|
| ... | ... | @@ -45,7 +59,7 @@ |
| 45 | 59 |
app:layout_constraintStart_toStartOf="parent"
|
| 46 | 60 |
app:layout_constraintTop_toBottomOf="@id/wordmark"
|
| 47 | 61 |
app:layout_constraintWidth_percent="0.8"
|
| 48 |
- tools:text="@string/about_content" />
|
|
| 62 |
+ tools:text="@string/tor_about_content" />
|
|
| 49 | 63 |
|
| 50 | 64 |
<TextView
|
| 51 | 65 |
android:id="@+id/about_text"
|
| ... | ... | @@ -392,6 +392,12 @@ |
| 392 | 392 |
<item name="fontFamily">@font/metropolis_semibold</item>
|
| 393 | 393 |
</style>
|
| 394 | 394 |
|
| 395 |
+ <style name="Header24TextStyle" parent="TextAppearance.MaterialComponents.Body1">
|
|
| 396 |
+ <item name="android:textColor">?primaryText</item>
|
|
| 397 |
+ <item name="android:textSize">24sp</item>
|
|
| 398 |
+ <item name="fontFamily">@font/metropolis_semibold</item>
|
|
| 399 |
+ </style>
|
|
| 400 |
+ |
|
| 395 | 401 |
<style name="Header16TextStyle" parent="TextAppearance.MaterialComponents.Body1">
|
| 396 | 402 |
<item name="android:textColor">?primaryText</item>
|
| 397 | 403 |
<item name="android:textSize">16sp</item>
|
| ... | ... | @@ -2,6 +2,9 @@ |
| 2 | 2 |
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
| 3 | 3 |
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
| 4 | 4 |
<resources>
|
| 5 |
+ <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
|
|
| 6 |
+ <string name="tor_about_content">%1$s is produced by the Tor Project, a U.S.-based 501(c)(3) nonprofit.</string>
|
|
| 7 |
+ |
|
| 5 | 8 |
<!-- Preference for enabling non-Private Browsing Mode-->
|
| 6 | 9 |
<string name="preferences_disable_normal_mode">Allow Only Private Browsing Mode</string>
|
| 7 | 10 |
<!-- Preference link to donate to The Tor Project-->
|