Skip to content
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 @@ -46,7 +46,6 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
Expand All @@ -63,19 +62,19 @@ import com.owncloud.android.lib.resources.assistant.chat.model.Conversation
@Suppress("LongMethod")
@Composable
fun ConversationScreen(viewModel: ConversationViewModel, close: () -> Unit, openChat: (Long) -> Unit) {
val context = LocalContext.current
val screenState by viewModel.screenState.collectAsState()
val errorMessageId by viewModel.errorMessageId.collectAsState()
val conversations by viewModel.conversations.collectAsState()
val snackbarHostState = remember { SnackbarHostState() }
val errorString = errorMessageId?.let { stringResource(it) }

LaunchedEffect(Unit) {
viewModel.fetchConversations()
}

LaunchedEffect(errorMessageId) {
errorMessageId?.let {
snackbarHostState.showSnackbar(context.getString(it))
LaunchedEffect(errorString) {
errorString?.let {
snackbarHostState.showSnackbar(it)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import com.owncloud.android.utils.theme.CapabilityUtils
import com.owncloud.android.utils.theme.ViewThemeUtils
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
import javax.inject.Inject

/**
Expand Down Expand Up @@ -503,7 +504,9 @@ class FileDetailsSharingProcessFragment :
val currentLimit = share?.remainingDownloadLimit() ?: return
if (currentLimit > 0) {
binding.shareProcessSetDownloadLimitSwitch.isChecked = true
binding.shareProcessSetDownloadLimitInput.setText(currentLimit.toString())
binding.shareProcessSetDownloadLimitInput.setText(
"%d".format(Locale.getDefault(), currentLimit)
)
}
}

Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values/dims.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@
<dimen name="button_corner_radius">24dp</dimen>
<dimen name="status_corner_radius">12dp</dimen>
<dimen name="backup_button_width">160dp</dimen>
<dimen name="settings_activity_padding">24dp</dimen>
<integer name="media_grid_width">4</integer>
<dimen name="account_action_button_margin">12dp</dimen>
<dimen name="account_action_button_height">50dp</dimen>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1160,7 +1160,6 @@
<string name="uploader_upload_failed_sync_conflict_error">File upload conflict</string>
<string name="uploader_upload_failed_sync_conflict_error_content">Pick which version to keep of %1$s</string>
<string name="upload_list_resolve_conflict">Resolve conflict</string>
<string name="upload_list_cancel_upload">Cancel upload</string>
<string name="upload_list_delete">Delete</string>
<string name="create_new">New</string>
<string name="editor_placeholder" translatable="false">%1$s %2$s</string>
Expand Down
Loading