mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 16:10:00 +00:00
Improve loading state and add preview.
This commit is contained in:
committed by
Benoit Marty
parent
c0542c8702
commit
d6ebec8d9a
+6
@@ -13,6 +13,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
|
|||||||
import io.element.android.libraries.architecture.AsyncData
|
import io.element.android.libraries.architecture.AsyncData
|
||||||
import io.element.android.libraries.designsystem.components.media.aWaveForm
|
import io.element.android.libraries.designsystem.components.media.aWaveForm
|
||||||
import io.element.android.libraries.matrix.api.media.MediaSource
|
import io.element.android.libraries.matrix.api.media.MediaSource
|
||||||
|
import io.element.android.libraries.matrix.api.timeline.Timeline
|
||||||
import io.element.android.libraries.mediaviewer.api.MediaInfo
|
import io.element.android.libraries.mediaviewer.api.MediaInfo
|
||||||
import io.element.android.libraries.mediaviewer.api.aPdfMediaInfo
|
import io.element.android.libraries.mediaviewer.api.aPdfMediaInfo
|
||||||
import io.element.android.libraries.mediaviewer.api.aVideoMediaInfo
|
import io.element.android.libraries.mediaviewer.api.aVideoMediaInfo
|
||||||
@@ -148,6 +149,11 @@ open class MediaViewerStateProvider : PreviewParameterProvider<MediaViewerState>
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
|
aMediaViewerState(
|
||||||
|
listOf(
|
||||||
|
MediaViewerPageData.Loading(Timeline.PaginationDirection.BACKWARDS)
|
||||||
|
),
|
||||||
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+7
-1
@@ -195,7 +195,13 @@ fun MediaViewerView(
|
|||||||
}
|
}
|
||||||
else -> {
|
else -> {
|
||||||
TopAppBar(
|
TopAppBar(
|
||||||
title = {},
|
title = {
|
||||||
|
Text(
|
||||||
|
text = stringResource(id = CommonStrings.common_loading_more),
|
||||||
|
style = ElementTheme.typography.fontBodyMdMedium,
|
||||||
|
color = ElementTheme.colors.textPrimary,
|
||||||
|
)
|
||||||
|
},
|
||||||
colors = TopAppBarDefaults.topAppBarColors(
|
colors = TopAppBarDefaults.topAppBarColors(
|
||||||
containerColor = Color.Transparent.copy(0.6f),
|
containerColor = Color.Transparent.copy(0.6f),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -182,6 +182,7 @@ Reason: %1$s."</string>
|
|||||||
<string name="common_light">"Light"</string>
|
<string name="common_light">"Light"</string>
|
||||||
<string name="common_link_copied_to_clipboard">"Link copied to clipboard"</string>
|
<string name="common_link_copied_to_clipboard">"Link copied to clipboard"</string>
|
||||||
<string name="common_loading">"Loading…"</string>
|
<string name="common_loading">"Loading…"</string>
|
||||||
|
<string name="common_loading_more">"Loading more…"</string>
|
||||||
<plurals name="common_member_count">
|
<plurals name="common_member_count">
|
||||||
<item quantity="one">"%1$d member"</item>
|
<item quantity="one">"%1$d member"</item>
|
||||||
<item quantity="other">"%1$d members"</item>
|
<item quantity="other">"%1$d members"</item>
|
||||||
|
|||||||
Reference in New Issue
Block a user