|
|
@ -9,6 +9,7 @@ import android.util.AttributeSet
|
|
|
|
import android.widget.FrameLayout
|
|
|
|
import android.widget.FrameLayout
|
|
|
|
import androidx.annotation.StringRes
|
|
|
|
import androidx.annotation.StringRes
|
|
|
|
import androidx.fragment.app.findFragment
|
|
|
|
import androidx.fragment.app.findFragment
|
|
|
|
|
|
|
|
import androidx.navigation.NavController
|
|
|
|
import androidx.navigation.fragment.findNavController
|
|
|
|
import androidx.navigation.fragment.findNavController
|
|
|
|
import androidx.recyclerview.widget.LinearLayoutManager
|
|
|
|
import androidx.recyclerview.widget.LinearLayoutManager
|
|
|
|
import kotlinx.android.synthetic.main.component_sync_tabs.view.*
|
|
|
|
import kotlinx.android.synthetic.main.component_sync_tabs.view.*
|
|
|
@ -19,6 +20,7 @@ import kotlinx.coroutines.launch
|
|
|
|
import mozilla.components.browser.storage.sync.SyncedDeviceTabs
|
|
|
|
import mozilla.components.browser.storage.sync.SyncedDeviceTabs
|
|
|
|
import mozilla.components.feature.syncedtabs.view.SyncedTabsView
|
|
|
|
import mozilla.components.feature.syncedtabs.view.SyncedTabsView
|
|
|
|
import org.mozilla.fenix.R
|
|
|
|
import org.mozilla.fenix.R
|
|
|
|
|
|
|
|
import java.lang.IllegalStateException
|
|
|
|
|
|
|
|
|
|
|
|
class SyncedTabsLayout @JvmOverloads constructor(
|
|
|
|
class SyncedTabsLayout @JvmOverloads constructor(
|
|
|
|
context: Context,
|
|
|
|
context: Context,
|
|
|
@ -45,10 +47,17 @@ class SyncedTabsLayout @JvmOverloads constructor(
|
|
|
|
// We may still be displaying a "loading" spinner, hide it.
|
|
|
|
// We may still be displaying a "loading" spinner, hide it.
|
|
|
|
stopLoading()
|
|
|
|
stopLoading()
|
|
|
|
|
|
|
|
|
|
|
|
sync_tabs_status.text = context.getText(stringResourceForError(error))
|
|
|
|
val navController: NavController? = try {
|
|
|
|
|
|
|
|
findFragment<SyncedTabsFragment>().findNavController()
|
|
|
|
|
|
|
|
} catch (exception: IllegalStateException) {
|
|
|
|
|
|
|
|
null
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
synced_tabs_list.visibility = View.GONE
|
|
|
|
val descriptionResId = stringResourceForError(error)
|
|
|
|
sync_tabs_status.visibility = View.VISIBLE
|
|
|
|
val errorItem = getErrorItem(navController, error, descriptionResId)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
val errorList: List<SyncedTabsAdapter.AdapterItem> = listOf(errorItem)
|
|
|
|
|
|
|
|
adapter.submitList(errorList)
|
|
|
|
|
|
|
|
|
|
|
|
synced_tabs_pull_to_refresh.isEnabled = pullToRefreshEnableState(error)
|
|
|
|
synced_tabs_pull_to_refresh.isEnabled = pullToRefreshEnableState(error)
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -56,17 +65,11 @@ class SyncedTabsLayout @JvmOverloads constructor(
|
|
|
|
|
|
|
|
|
|
|
|
override fun displaySyncedTabs(syncedTabs: List<SyncedDeviceTabs>) {
|
|
|
|
override fun displaySyncedTabs(syncedTabs: List<SyncedDeviceTabs>) {
|
|
|
|
coroutineScope.launch {
|
|
|
|
coroutineScope.launch {
|
|
|
|
synced_tabs_list.visibility = View.VISIBLE
|
|
|
|
|
|
|
|
sync_tabs_status.visibility = View.GONE
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
adapter.updateData(syncedTabs)
|
|
|
|
adapter.updateData(syncedTabs)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
override fun startLoading() {
|
|
|
|
override fun startLoading() {
|
|
|
|
synced_tabs_list.visibility = View.VISIBLE
|
|
|
|
|
|
|
|
sync_tabs_status.visibility = View.GONE
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
synced_tabs_pull_to_refresh.isRefreshing = true
|
|
|
|
synced_tabs_pull_to_refresh.isRefreshing = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -80,7 +83,8 @@ class SyncedTabsLayout @JvmOverloads constructor(
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
companion object {
|
|
|
|
companion object {
|
|
|
|
internal fun pullToRefreshEnableState(error: SyncedTabsView.ErrorType) = when (error) {
|
|
|
|
|
|
|
|
|
|
|
|
private fun pullToRefreshEnableState(error: SyncedTabsView.ErrorType) = when (error) {
|
|
|
|
// Disable "pull-to-refresh" when we clearly can't sync tabs, and user needs to take an
|
|
|
|
// Disable "pull-to-refresh" when we clearly can't sync tabs, and user needs to take an
|
|
|
|
// action within the app.
|
|
|
|
// action within the app.
|
|
|
|
SyncedTabsView.ErrorType.SYNC_UNAVAILABLE,
|
|
|
|
SyncedTabsView.ErrorType.SYNC_UNAVAILABLE,
|
|
|
@ -93,12 +97,26 @@ class SyncedTabsLayout @JvmOverloads constructor(
|
|
|
|
SyncedTabsView.ErrorType.NO_TABS_AVAILABLE -> true
|
|
|
|
SyncedTabsView.ErrorType.NO_TABS_AVAILABLE -> true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
internal fun stringResourceForError(error: SyncedTabsView.ErrorType) = when (error) {
|
|
|
|
private fun stringResourceForError(error: SyncedTabsView.ErrorType) = when (error) {
|
|
|
|
SyncedTabsView.ErrorType.MULTIPLE_DEVICES_UNAVAILABLE -> R.string.synced_tabs_connect_another_device
|
|
|
|
SyncedTabsView.ErrorType.MULTIPLE_DEVICES_UNAVAILABLE -> R.string.synced_tabs_connect_another_device
|
|
|
|
SyncedTabsView.ErrorType.SYNC_ENGINE_UNAVAILABLE -> R.string.synced_tabs_enable_tab_syncing
|
|
|
|
SyncedTabsView.ErrorType.SYNC_ENGINE_UNAVAILABLE -> R.string.synced_tabs_enable_tab_syncing
|
|
|
|
SyncedTabsView.ErrorType.SYNC_UNAVAILABLE -> R.string.synced_tabs_sign_in_message
|
|
|
|
SyncedTabsView.ErrorType.SYNC_UNAVAILABLE -> R.string.synced_tabs_sign_in_message
|
|
|
|
SyncedTabsView.ErrorType.SYNC_NEEDS_REAUTHENTICATION -> R.string.synced_tabs_reauth
|
|
|
|
SyncedTabsView.ErrorType.SYNC_NEEDS_REAUTHENTICATION -> R.string.synced_tabs_reauth
|
|
|
|
SyncedTabsView.ErrorType.NO_TABS_AVAILABLE -> R.string.synced_tabs_no_tabs
|
|
|
|
SyncedTabsView.ErrorType.NO_TABS_AVAILABLE -> R.string.synced_tabs_no_tabs
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private fun getErrorItem(
|
|
|
|
|
|
|
|
navController: NavController?,
|
|
|
|
|
|
|
|
error: SyncedTabsView.ErrorType,
|
|
|
|
|
|
|
|
@StringRes stringResId: Int
|
|
|
|
|
|
|
|
): SyncedTabsAdapter.AdapterItem = when (error) {
|
|
|
|
|
|
|
|
SyncedTabsView.ErrorType.MULTIPLE_DEVICES_UNAVAILABLE,
|
|
|
|
|
|
|
|
SyncedTabsView.ErrorType.SYNC_ENGINE_UNAVAILABLE,
|
|
|
|
|
|
|
|
SyncedTabsView.ErrorType.SYNC_NEEDS_REAUTHENTICATION,
|
|
|
|
|
|
|
|
SyncedTabsView.ErrorType.NO_TABS_AVAILABLE -> SyncedTabsAdapter.AdapterItem
|
|
|
|
|
|
|
|
.Error(descriptionResId = stringResId)
|
|
|
|
|
|
|
|
SyncedTabsView.ErrorType.SYNC_UNAVAILABLE -> SyncedTabsAdapter.AdapterItem
|
|
|
|
|
|
|
|
.Error(descriptionResId = stringResId, navController = navController)
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|