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.

Sign up for GitHub

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

Jump to bottom

fix: modify download placeholders to clarify saved and downloaded cases [WPB-4732] #2322

Merged
merged 1 commit into from
Oct 12, 2023
Merged

fix: modify download placeholders to clarify saved and downloaded cases [WPB-4732] #2322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 0 additions & 16 deletions ...tlin/com/wire/android/ui/home/conversations/model/messagetypes/asset/AssetMessageTypes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.wrapContentWidth
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Card
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand Down Expand Up @@ -301,21 +300,6 @@ private fun DownloadStatusIcon(assetDownloadStatus: Message.DownloadStatus, asse
size = dimensions().spacing16x
)

assetUploadStatus == Message.UploadStatus.FAILED_UPLOAD -> {}
assetDownloadStatus == Message.DownloadStatus.SAVED_INTERNALLY -> Icon(
painter = painterResource(id = R.drawable.ic_download),
contentDescription = stringResource(R.string.content_description_download_icon),
modifier = Modifier.size(dimensions().wireIconButtonSize),
tint = MaterialTheme.wireColorScheme.secondaryText
)

assetDownloadStatus == Message.DownloadStatus.SAVED_EXTERNALLY -> Icon(
painter = painterResource(id = R.drawable.ic_check_tick),
contentDescription = stringResource(R.string.content_description_check),
modifier = Modifier.size(dimensions().wireIconButtonSize),
tint = MaterialTheme.wireColorScheme.secondaryText
)

else -> {}
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@
<string name="asset_message_tap_to_download_text">Tap to download</string>
<string name="asset_message_upload_in_progress_text">Uploading…</string>
<string name="asset_message_download_in_progress_text">Downloading…</string>
<string name="asset_message_downloaded_internally_text">Downloaded</string>
<string name="asset_message_downloaded_internally_text">Tap to view</string>
<string name="asset_message_saved_externally_text">Saved</string>
<string name="asset_message_failed_download_text">File not available</string>
<string name="asset_message_failed_upload_text">File upload failed</string>
Expand Down
Loading