|
|
@ -10,39 +10,36 @@ import android.view.LayoutInflater
|
|
|
|
import android.view.View
|
|
|
|
import android.view.View
|
|
|
|
import android.view.ViewGroup
|
|
|
|
import android.view.ViewGroup
|
|
|
|
import android.widget.FrameLayout
|
|
|
|
import android.widget.FrameLayout
|
|
|
|
import androidx.fragment.app.DialogFragment
|
|
|
|
import com.google.android.material.bottomsheet.BottomSheetDialog
|
|
|
|
|
|
|
|
import org.mozilla.fenix.addons.runIfFragmentIsAttached
|
|
|
|
import androidx.lifecycle.lifecycleScope
|
|
|
|
import androidx.lifecycle.lifecycleScope
|
|
|
|
import androidx.navigation.fragment.findNavController
|
|
|
|
import androidx.navigation.fragment.findNavController
|
|
|
|
import com.google.android.material.bottomsheet.BottomSheetBehavior
|
|
|
|
import com.google.android.material.bottomsheet.BottomSheetBehavior
|
|
|
|
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
|
|
|
|
import androidx.appcompat.app.AppCompatDialogFragment
|
|
|
|
import kotlinx.android.synthetic.main.fragment_sign_out.view.*
|
|
|
|
import kotlinx.android.synthetic.main.fragment_sign_out.view.*
|
|
|
|
import kotlinx.coroutines.launch
|
|
|
|
import kotlinx.coroutines.launch
|
|
|
|
import mozilla.components.service.fxa.manager.FxaAccountManager
|
|
|
|
import mozilla.components.service.fxa.manager.FxaAccountManager
|
|
|
|
import org.mozilla.fenix.R
|
|
|
|
import org.mozilla.fenix.R
|
|
|
|
import org.mozilla.fenix.ext.requireComponents
|
|
|
|
import org.mozilla.fenix.ext.requireComponents
|
|
|
|
|
|
|
|
|
|
|
|
class SignOutFragment : BottomSheetDialogFragment() {
|
|
|
|
class SignOutFragment : AppCompatDialogFragment() {
|
|
|
|
private lateinit var accountManager: FxaAccountManager
|
|
|
|
private lateinit var accountManager: FxaAccountManager
|
|
|
|
|
|
|
|
|
|
|
|
override fun onCreate(savedInstanceState: Bundle?) {
|
|
|
|
override fun onCreate(savedInstanceState: Bundle?) {
|
|
|
|
super.onCreate(savedInstanceState)
|
|
|
|
super.onCreate(savedInstanceState)
|
|
|
|
setStyle(DialogFragment.STYLE_NO_TITLE, R.style.FirefoxAccountsDialogStyle)
|
|
|
|
setStyle(STYLE_NO_TITLE, R.style.BottomSheet)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
|
|
|
|
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
|
|
|
|
val dialog = super.onCreateDialog(savedInstanceState)
|
|
|
|
BottomSheetDialog(requireContext(), this.theme).apply {
|
|
|
|
|
|
|
|
setOnShowListener {
|
|
|
|
dialog.setOnShowListener {
|
|
|
|
val bottomSheet =
|
|
|
|
val bottomSheet = dialog.findViewById<View>(
|
|
|
|
findViewById<View>(com.google.android.material.R.id.design_bottom_sheet) as FrameLayout
|
|
|
|
com.google.android.material.R.id.design_bottom_sheet
|
|
|
|
val behavior = BottomSheetBehavior.from(bottomSheet)
|
|
|
|
) as FrameLayout
|
|
|
|
behavior.state = BottomSheetBehavior.STATE_EXPANDED
|
|
|
|
val behavior = BottomSheetBehavior.from(bottomSheet)
|
|
|
|
}
|
|
|
|
behavior.state = BottomSheetBehavior.STATE_EXPANDED
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return dialog
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
override fun onCreateView(
|
|
|
|
override fun onCreateView(
|
|
|
|
inflater: LayoutInflater,
|
|
|
|
inflater: LayoutInflater,
|
|
|
|
container: ViewGroup?,
|
|
|
|
container: ViewGroup?,
|
|
|
@ -63,13 +60,15 @@ class SignOutFragment : BottomSheetDialogFragment() {
|
|
|
|
super.onViewCreated(view, savedInstanceState)
|
|
|
|
super.onViewCreated(view, savedInstanceState)
|
|
|
|
|
|
|
|
|
|
|
|
view.signOutDisconnect.setOnClickListener {
|
|
|
|
view.signOutDisconnect.setOnClickListener {
|
|
|
|
viewLifecycleOwner.lifecycleScope.launch {
|
|
|
|
lifecycleScope.launch {
|
|
|
|
requireComponents
|
|
|
|
requireComponents
|
|
|
|
.backgroundServices.accountAbnormalities.userRequestedLogout()
|
|
|
|
.backgroundServices.accountAbnormalities.userRequestedLogout()
|
|
|
|
accountManager.logout()
|
|
|
|
accountManager.logout()
|
|
|
|
}.invokeOnCompletion {
|
|
|
|
}.invokeOnCompletion {
|
|
|
|
if (!findNavController().popBackStack(R.id.settingsFragment, false)) {
|
|
|
|
runIfFragmentIsAttached {
|
|
|
|
dismiss()
|
|
|
|
if (!findNavController().popBackStack(R.id.settingsFragment, false)) {
|
|
|
|
|
|
|
|
dismiss()
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|