Archives
/
iceraven-browser
mirror of https://github.com/fork-maintainers/iceraven-browser
2
0
Fork 0
Code Issues Releases Wiki Activity

For #21608: Update strings for home screen dialog features

Browse Source
upstream-sync
Arturo Mejia 3 years ago committed by mergify[bot]
parent ef2a491614
commit ca30f518d8
4 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File

5
app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
Unescape Escape View File

@ -85,9 +85,4 @@ object FeatureFlags {
return Config.channel.isNightlyOrDebug &&
"en-US" == LocaleManager.getCurrentLocale(context)?.toLanguageTag() ?: getSystemDefault().toLanguageTag()
}
/**
* Enables showing the homescreen onboarding card.
*/
val showHomeOnboarding = Config.channel.isDebug
}

11
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
Unescape Escape View File

@ -27,7 +27,6 @@ import mozilla.components.feature.top.sites.TopSite
import mozilla.components.support.ktx.android.view.showKeyboard
import mozilla.components.support.ktx.kotlin.isUrl
import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.FeatureFlags
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R
import org.mozilla.fenix.browser.BrowserFragmentDirections
@ -455,12 +454,10 @@ class DefaultSessionControlController(
}
override fun handleShowOnboardingDialog() {
if (FeatureFlags.showHomeOnboarding) {
navController.nav(
R.id.homeFragment,
HomeFragmentDirections.actionGlobalHomeOnboardingDialog()
)
}
navController.nav(
R.id.homeFragment,
HomeFragmentDirections.actionGlobalHomeOnboardingDialog()
)
}
override fun handleReadPrivacyNoticeClicked() {

16
app/src/main/res/layout/fragment_onboarding_home_dialog.xml
Unescape Escape View File

@ -37,7 +37,7 @@
android:layout_marginTop="16dp"
android:layout_marginHorizontal="@dimen/oboarding_home_dialog_margin_horizontal"
android:lineHeight="24sp"
android:text="@string/onboarding_home_screen_title"
android:text="@string/onboarding_home_screen_title_2"
android:textAppearance="@style/Header20TextStyle"
android:textAlignment="center"
app:layout_constraintEnd_toEndOf="parent"
@ -52,7 +52,7 @@
android:layout_marginHorizontal="@dimen/oboarding_home_dialog_margin_horizontal"
android:lineHeight="24sp"
android:textAppearance="@style/Body14TextStyle"
android:text="@string/onboarding_home_screen_description"
android:text="@string/onboarding_home_screen_description_2"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/welcome_title" />
@ -78,7 +78,7 @@
android:layout_marginEnd="@dimen/oboarding_home_dialog_margin_horizontal"
android:layout_marginTop="26dp"
android:lineHeight="20sp"
android:text="@string/onboarding_home_screen_section_home_title"
android:text="@string/onboarding_home_screen_section_home_title_2"
android:textAppearance="@style/Header14TextStyle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/home_icon"
@ -101,7 +101,7 @@
android:layout_marginTop="6dp"
android:layout_marginEnd="@dimen/oboarding_home_dialog_margin_horizontal"
android:lineHeight="20sp"
android:text="@string/onboarding_home_screen_section_home_description"
android:text="@string/onboarding_home_screen_section_home_description_2"
android:textAppearance="@style/Body14TextStyle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/home_placeholder"
@ -127,7 +127,7 @@
android:layout_marginEnd="@dimen/oboarding_home_dialog_margin_horizontal"
android:layout_marginTop="26dp"
android:lineHeight="20sp"
android:text="@string/onboarding_home_screen_section_cleaner_tab_tray_title"
android:text="@string/onboarding_home_screen_section_cleaner_tab_tray_title_2"
android:textAppearance="@style/Header14TextStyle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/cleaner_tab_tray_icon"
@ -150,7 +150,7 @@
android:layout_marginTop="6dp"
android:layout_marginEnd="@dimen/oboarding_home_dialog_margin_horizontal"
android:lineHeight="20sp"
android:text="@string/onboarding_home_screen_section_cleaner_tab_tray_description"
android:text="@string/onboarding_home_screen_section_cleaner_tab_tray_description_2"
android:textAppearance="@style/Body14TextStyle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/cleaner_tab_tray_placeholder"
@ -176,7 +176,7 @@
android:layout_marginEnd="@dimen/oboarding_home_dialog_margin_horizontal"
android:layout_marginTop="26dp"
android:lineHeight="20sp"
android:text="@string/onboarding_home_screen_section_useful_history_title"
android:text="@string/onboarding_home_screen_section_useful_history_title_2"
android:textAppearance="@style/Header14TextStyle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/useful_history_icon"
@ -199,7 +199,7 @@
android:layout_marginTop="6dp"
android:layout_marginEnd="@dimen/oboarding_home_dialog_margin_horizontal"
android:lineHeight="20sp"
android:text="@string/onboarding_home_screen_section_useful_history_description"
android:text="@string/onboarding_home_screen_section_useful_history_description_2"
android:textAppearance="@style/Body14TextStyle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/useful_history_placeholder"

18
app/src/main/res/values/strings.xml
Unescape Escape View File

@ -258,21 +258,21 @@
<!-- Home onboarding -->
<!-- Onboarding home screen dialog title text. Firefox is intentionally hardcoded. -->
<string name="onboarding_home_screen_title">What’s new in Firefox!</string>
<string name="onboarding_home_screen_title_2">What’s new in Firefox</string>
<!-- Onboarding home screen dialog description text. -->
<string name="onboarding_home_screen_description">It’s now easier to pick up where you left off so you can stay in the flow.</string>
<string name="onboarding_home_screen_description_2">It’s now easier to pick back up where you left off.</string>
<!-- Onboarding home screen dialog title text for the home section. Firefox is intentionally hardcoded. -->
<string name="onboarding_home_screen_section_home_title">Personalized Firefox home</string>
<string name="onboarding_home_screen_section_home_title_2">Personalized Firefox homepage</string>
<!-- Onboarding home screen dialog description text for the home section. -->
<string name="onboarding_home_screen_section_home_description">Access your open tabs, bookmarks, and history directly from your home screen.</string>
<string name="onboarding_home_screen_section_home_description_2">Jump to your open tabs, bookmarks, and browsing history.</string>
<!-- Onboarding home screen dialog description text for the tab tray section. -->
<string name="onboarding_home_screen_section_cleaner_tab_tray_title">Cleaner tab tray</string>
<!-- Onboarding home screen dialog description text for the tab tray section. Firefox is intentionally hardcoded. -->
<string name="onboarding_home_screen_section_cleaner_tab_tray_description">Firefox helps you to manage your tabs and quickly find what you’re looking for.</string>
<string name="onboarding_home_screen_section_cleaner_tab_tray_title_2">Clean, organized tabs</string>
<!-- Onboarding home screen dialog description text for the tab tray section. -->
<string name="onboarding_home_screen_section_cleaner_tab_tray_description_2">Clear away tab clutter with improved layout and auto-closing tabs. </string>
<!-- Onboarding home screen dialog description text for the history section. -->
<string name="onboarding_home_screen_section_useful_history_title">Useful history</string>
<string name="onboarding_home_screen_section_useful_history_title_2">Recent searches</string>
<!-- Onboarding home screen dialog description text for the history section. -->
<string name="onboarding_home_screen_section_useful_history_description">Get a better overview of your browsing history.</string>
<string name="onboarding_home_screen_section_useful_history_description_2">Revisit your latest searches from your homepage and tabs.</string>
<!-- Search Widget -->
<!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->

Write Preview
Loading…
Cancel
Save