blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #2395 - Navigates to turn on sync on button press

master
Jeff Boek 2019-05-20 19:04:16 -07:00
parent 9a76c11dae
commit 692724be2f
7 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingFirefoxAccountViewHolder.kt
View File

@ -5,15 +5,22 @@
package org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding
import android.view.View
import androidx.navigation.Navigation
import androidx.recyclerview.widget.RecyclerView
import kotlinx.android.synthetic.main.onboarding_firefox_account.view.*
import org.mozilla.fenix.R
import org.mozilla.fenix.home.HomeFragmentDirections
class OnboardingFirefoxAccountViewHolder(view: View) : RecyclerView.ViewHolder(view) {
init {
val appName = view.context.getString(R.string.app_name)
view.header_text.text = view.context.getString(R.string.onboarding_firefox_account_header, appName)
view.turn_on_sync_button.setOnClickListener {
val directions = HomeFragmentDirections.actionHomeFragmentToTurnOnSyncFragment()
Navigation.findNavController(view).navigate(directions)
}
}
companion object {

2
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivateBrowsingViewHolder.kt
View File

@ -14,8 +14,6 @@ import androidx.recyclerview.widget.RecyclerView
import kotlinx.android.synthetic.main.onboarding_private_browsing.view.*
import org.mozilla.fenix.R
class OnboardingPrivateBrowsingViewHolder(view: View) : RecyclerView.ViewHolder(view) {
init {

1
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingThemePickerViewHolder.kt
View File

@ -11,7 +11,6 @@ import androidx.recyclerview.widget.RecyclerView
import kotlinx.android.synthetic.main.onboarding_section_header.view.*
import kotlinx.android.synthetic.main.onboarding_theme_picker.view.*
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.asActivity
import org.mozilla.fenix.ext.components
import org.mozilla.fenix.utils.Settings

12
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingTrackingProtectionViewHolder.kt
View File

@ -29,12 +29,11 @@ class OnboardingTrackingProtectionViewHolder(val view: View) : RecyclerView.View
val switch = view.tracking_protection_toggle
switch.isChecked = Settings.getInstance(view.context).shouldUseTrackingProtection
switch.isChecked = Settings.getInstance(view.context).shouldUseTrackingProtection
switch.setOnCheckedChangeListener { _, isChecked ->
updateTrackingProtectionSetting(isChecked)
}
}
private fun updateTrackingProtectionSetting(enabled: Boolean) {
@ -42,12 +41,9 @@ class OnboardingTrackingProtectionViewHolder(val view: View) : RecyclerView.View
with(view.context.components.core) {
val policy = createTrackingProtectionPolicy(enabled)
engine.settings.trackingProtectionPolicy = policy
with(sessionManager) {
sessions.forEach {
if (enabled)
getEngineSession(it)?.enableTrackingProtection(policy) else
getEngineSession(it)?.disableTrackingProtection()
}
sessionManager.sessions.forEach {
if (enabled) sessionManager.getEngineSession(it)?.enableTrackingProtection(policy)
else sessionManager.getEngineSession(it)?.disableTrackingProtection()
}
}

1
app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
View File

@ -50,7 +50,6 @@ object SupportUtils {
setPackage(context.packageName)
}
private fun getEncodedTopicUTF8(topic: String): String {
try {
return URLEncoder.encode(topic, "UTF-8")

2
app/src/main/res/layout/onboarding_firefox_account.xml
View File

@ -20,7 +20,7 @@
android:textAppearance="@style/Header16TextStyle"
android:textColor="@color/onboarding_card_primary_text_dark"/>
<FrameLayout
android:id="@+id/read_button"
android:id="@+id/turn_on_sync_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"

3
app/src/main/res/navigation/nav_graph.xml
View File

@ -20,6 +20,9 @@
android:name="org.mozilla.fenix.home.HomeFragment"
android:label="fragment_home"
tools:layout="@layout/fragment_home">
<action
android:id="@+id/action_homeFragment_to_turnOnSyncFragment"
app:destination="@+id/turnOnSyncFragment" />
<action
android:id="@+id/action_homeFragment_to_searchFragment"
app:destination="@id/searchFragment" />