No issue: Add more settings animations (#9750)

fennec/production
Sawyer Blatz 4 years ago committed by GitHub
parent d9b5cedd9b
commit e94af334fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -9,15 +9,14 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle
import androidx.appcompat.content.res.AppCompatResources
import android.os.Handler import android.os.Handler
import android.widget.Toast import android.widget.Toast
import androidx.appcompat.content.res.AppCompatResources
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.navigation.NavDirections import androidx.navigation.NavDirections
import androidx.navigation.findNavController import androidx.navigation.findNavController
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import androidx.preference.Preference import androidx.preference.Preference
import androidx.preference.Preference.OnPreferenceClickListener
import androidx.preference.PreferenceCategory import androidx.preference.PreferenceCategory
import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceFragmentCompat
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
@ -36,12 +35,12 @@ import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.ext.application import org.mozilla.fenix.ext.application
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.toRoundedDrawable
import org.mozilla.fenix.ext.getPreferenceKey import org.mozilla.fenix.ext.getPreferenceKey
import org.mozilla.fenix.ext.metrics import org.mozilla.fenix.ext.metrics
import org.mozilla.fenix.ext.requireComponents import org.mozilla.fenix.ext.requireComponents
import org.mozilla.fenix.ext.settings import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.ext.showToolbar import org.mozilla.fenix.ext.showToolbar
import org.mozilla.fenix.ext.toRoundedDrawable
import org.mozilla.fenix.settings.account.AccountAuthErrorPreference import org.mozilla.fenix.settings.account.AccountAuthErrorPreference
import org.mozilla.fenix.settings.account.AccountPreference import org.mozilla.fenix.settings.account.AccountPreference
import kotlin.system.exitProcess import kotlin.system.exitProcess
@ -182,6 +181,9 @@ class SettingsFragment : PreferenceFragmentCompat() {
recyclerView.isVerticalScrollBarEnabled = false recyclerView.isVerticalScrollBarEnabled = false
val directions: NavDirections? = when (preference.key) { val directions: NavDirections? = when (preference.key) {
resources.getString(R.string.pref_key_sign_in) -> {
SettingsFragmentDirections.actionSettingsFragmentToTurnOnSyncFragment()
}
resources.getString(R.string.pref_key_search_settings) -> { resources.getString(R.string.pref_key_search_settings) -> {
SettingsFragmentDirections.actionSettingsFragmentToSearchEngineFragment() SettingsFragmentDirections.actionSettingsFragmentToSearchEngineFragment()
} }
@ -280,13 +282,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
return super.onPreferenceTreeClick(preference) return super.onPreferenceTreeClick(preference)
} }
private fun getClickListenerForSignIn(): OnPreferenceClickListener {
return OnPreferenceClickListener {
context!!.components.services.launchPairingSignIn(context!!, findNavController())
true
}
}
private fun setupPreferences() { private fun setupPreferences() {
val leakKey = getPreferenceKey(R.string.pref_key_leakcanary) val leakKey = getPreferenceKey(R.string.pref_key_leakcanary)
val debuggingKey = getPreferenceKey(R.string.pref_key_remote_debugging) val debuggingKey = getPreferenceKey(R.string.pref_key_remote_debugging)
@ -409,7 +404,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
// Signed-out. // Signed-out.
} else { } else {
preferenceSignIn?.isVisible = true preferenceSignIn?.isVisible = true
preferenceSignIn?.onPreferenceClickListener = getClickListenerForSignIn()
preferenceFirefoxAccount?.isVisible = false preferenceFirefoxAccount?.isVisible = false
preferenceFirefoxAccountAuthError?.isVisible = false preferenceFirefoxAccountAuthError?.isVisible = false
accountPreferenceCategory?.isVisible = false accountPreferenceCategory?.isVisible = false

@ -362,18 +362,38 @@
android:label="@string/preferences_passwords_logins_and_passwords"> android:label="@string/preferences_passwords_logins_and_passwords">
<action <action
android:id="@+id/action_loginsFragment_to_savedLoginsFragment" android:id="@+id/action_loginsFragment_to_savedLoginsFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right"
app:destination="@id/savedLoginsFragment" /> app:destination="@id/savedLoginsFragment" />
<action <action
android:id="@+id/action_loginsFragment_to_accountSettingsFragment" android:id="@+id/action_loginsFragment_to_accountSettingsFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right"
app:destination="@id/accountSettingsFragment" /> app:destination="@id/accountSettingsFragment" />
<action <action
android:id="@+id/action_loginsFragment_to_accountProblemFragment" android:id="@+id/action_loginsFragment_to_accountProblemFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right"
app:destination="@id/accountProblemFragment" /> app:destination="@id/accountProblemFragment" />
<action <action
android:id="@+id/action_loginsFragment_to_turnOnSyncFragment" android:id="@+id/action_loginsFragment_to_turnOnSyncFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right"
app:destination="@id/turnOnSyncFragment" /> app:destination="@id/turnOnSyncFragment" />
<action <action
android:id="@+id/action_loginsFragment_to_saveLoginSettingFragment" android:id="@+id/action_loginsFragment_to_saveLoginSettingFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right"
app:destination="@id/saveLoginSettingFragment" /> app:destination="@id/saveLoginSettingFragment" />
</fragment> </fragment>
@ -516,10 +536,18 @@
android:label="@string/preferences_site_permissions"> android:label="@string/preferences_site_permissions">
<action <action
android:id="@+id/action_site_permissions_to_manage_phone_features" android:id="@+id/action_site_permissions_to_manage_phone_features"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right"
app:destination="@id/SitePermissionsManagePhoneFeature" app:destination="@id/SitePermissionsManagePhoneFeature"
app:popUpTo="@id/sitePermissionsFragment" /> app:popUpTo="@id/sitePermissionsFragment" />
<action <action
android:id="@+id/action_site_permissions_to_exceptions" android:id="@+id/action_site_permissions_to_exceptions"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right"
app:destination="@id/sitePermissionsExceptionsFragment" app:destination="@id/sitePermissionsExceptionsFragment"
app:popUpTo="@id/sitePermissionsFragment" /> app:popUpTo="@id/sitePermissionsFragment" />
</fragment> </fragment>
@ -597,9 +625,17 @@
android:name="org.mozilla.fenix.settings.TrackingProtectionFragment"> android:name="org.mozilla.fenix.settings.TrackingProtectionFragment">
<action <action
android:id="@+id/action_trackingProtectionFragment_to_exceptionsFragment" android:id="@+id/action_trackingProtectionFragment_to_exceptionsFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right"
app:destination="@id/exceptionsFragment" /> app:destination="@id/exceptionsFragment" />
<action <action
android:id="@+id/action_trackingProtectionFragment_to_trackingProtectionBlockingFragment" android:id="@+id/action_trackingProtectionFragment_to_trackingProtectionBlockingFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right"
app:destination="@id/trackingProtectionBlockingFragment" /> app:destination="@id/trackingProtectionBlockingFragment" />
<action <action
android:id="@+id/action_trackingProtectionFragment_to_browserFragment" android:id="@+id/action_trackingProtectionFragment_to_browserFragment"
@ -678,7 +714,7 @@
android:id="@+id/action_shareFragment_to_turnOnSyncFragment" android:id="@+id/action_shareFragment_to_turnOnSyncFragment"
app:destination="@+id/turnOnSyncFragment" app:destination="@+id/turnOnSyncFragment"
app:popUpTo="@id/shareFragment" app:popUpTo="@id/shareFragment"
app:popUpToInclusive="true"></action> app:popUpToInclusive="true"/>
<action <action
android:id="@+id/action_shareFragment_to_accountProblemFragment" android:id="@+id/action_shareFragment_to_accountProblemFragment"
app:destination="@id/accountProblemFragment" /> app:destination="@id/accountProblemFragment" />

Loading…
Cancel
Save