Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add loading screen when importing asset (WPB-10217) #3260

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import kotlin.time.Duration

data class FeatureFlagState(
val showFileSharingDialog: Boolean = false,
val isFileSharingState: FileSharingState = FileSharingState.NoUser,
val isFileSharingState: FileSharingState = FileSharingState.Loading,
val shouldShowGuestRoomLinkDialog: Boolean = false,
val shouldShowE2eiCertificateRevokedDialog: Boolean = false,
val shouldShowTeamAppLockDialog: Boolean = false,
Expand All @@ -42,6 +42,7 @@ data class FeatureFlagState(
) {

sealed interface FileSharingState {
data object Loading : FileSharingState
data object NoUser : FileSharingState
data object AllowAll : FileSharingState
data class AllowSome(val allowedList: List<String>) : FileSharingState
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see http://www.gnu.org/licenses/.
*/

@file:Suppress("TooManyFunctions")

package com.wire.android.ui.sharing

import androidx.activity.compose.BackHandler
Expand Down Expand Up @@ -87,6 +90,7 @@ import com.wire.android.ui.home.messagecomposer.SelfDeletionDuration
import com.wire.android.ui.home.newconversation.common.SendContentButton
import com.wire.android.ui.home.sync.FeatureFlagNotificationViewModel
import com.wire.android.ui.theme.WireTheme
import com.wire.android.ui.theme.wireColorScheme
import com.wire.android.ui.theme.wireTypography
import com.wire.android.util.CustomTabsHelper
import com.wire.android.util.extension.getActivity
Expand All @@ -111,6 +115,11 @@ fun ImportMediaScreen(
featureFlagNotificationViewModel: FeatureFlagNotificationViewModel = hiltViewModel(),
) {
when (val fileSharingRestrictedState = featureFlagNotificationViewModel.featureFlagState.isFileSharingState) {
FeatureFlagState.FileSharingState.Loading -> {
ImportMediaLoadingContent(
navigateBack = navigator.finish
)
}
FeatureFlagState.FileSharingState.NoUser -> {
ImportMediaLoggedOutContent(
fileSharingRestrictedState = fileSharingRestrictedState,
Expand All @@ -134,6 +143,37 @@ fun ImportMediaScreen(
BackHandler { navigator.finish() }
}

@Composable
private fun ImportMediaLoadingContent(navigateBack: () -> Unit) {
WireScaffold(
topBar = {
WireCenterAlignedTopAppBar(
elevation = dimensions().spacing0x,
onNavigationPressed = navigateBack,
navigationIconType = NavigationIconType.Close,
title = stringResource(id = R.string.import_media_content_title),
)
},
modifier = Modifier.background(colorsScheme().background),
content = { internalPadding ->
Column(
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center,
modifier = Modifier
.fillMaxSize()
.padding(internalPadding)
.padding(horizontal = dimensions().spacing48x)
) {
WireCircularProgressIndicator(
progressColor = MaterialTheme.wireColorScheme.onSurface,
modifier = Modifier.align(Alignment.CenterHorizontally),
size = dimensions().spacing32x
)
}
}
)
}

@Composable
private fun ImportMediaAuthenticatedContent(
navigator: Navigator,
Expand Down
Loading