File tree Expand file tree Collapse file tree 4 files changed +8
-8
lines changed
nextcloud/client/assistant/conversation
owncloud/android/ui/fragment Expand file tree Collapse file tree 4 files changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -46,7 +46,6 @@ import androidx.compose.runtime.remember
4646import androidx.compose.runtime.setValue
4747import androidx.compose.ui.Alignment
4848import androidx.compose.ui.Modifier
49- import androidx.compose.ui.platform.LocalContext
5049import androidx.compose.ui.res.colorResource
5150import androidx.compose.ui.res.stringResource
5251import androidx.compose.ui.text.style.TextAlign
@@ -63,19 +62,19 @@ import com.owncloud.android.lib.resources.assistant.chat.model.Conversation
6362@Suppress(" LongMethod" )
6463@Composable
6564fun ConversationScreen (viewModel : ConversationViewModel , close : () -> Unit , openChat : (Long ) -> Unit ) {
66- val context = LocalContext .current
6765 val screenState by viewModel.screenState.collectAsState()
6866 val errorMessageId by viewModel.errorMessageId.collectAsState()
6967 val conversations by viewModel.conversations.collectAsState()
7068 val snackbarHostState = remember { SnackbarHostState () }
69+ val errorString = errorMessageId?.let { stringResource(it) }
7170
7271 LaunchedEffect (Unit ) {
7372 viewModel.fetchConversations()
7473 }
7574
76- LaunchedEffect (errorMessageId ) {
77- errorMessageId ?.let {
78- snackbarHostState.showSnackbar(context.getString(it) )
75+ LaunchedEffect (errorString ) {
76+ errorString ?.let {
77+ snackbarHostState.showSnackbar(it )
7978 }
8079 }
8180
Original file line number Diff line number Diff line change @@ -44,6 +44,7 @@ import com.owncloud.android.utils.theme.CapabilityUtils
4444import com.owncloud.android.utils.theme.ViewThemeUtils
4545import java.text.SimpleDateFormat
4646import java.util.Date
47+ import java.util.Locale
4748import javax.inject.Inject
4849
4950/* *
@@ -503,7 +504,9 @@ class FileDetailsSharingProcessFragment :
503504 val currentLimit = share?.remainingDownloadLimit() ? : return
504505 if (currentLimit > 0 ) {
505506 binding.shareProcessSetDownloadLimitSwitch.isChecked = true
506- binding.shareProcessSetDownloadLimitInput.setText(currentLimit.toString())
507+ binding.shareProcessSetDownloadLimitInput.setText(
508+ " %d" .format(Locale .getDefault(), currentLimit)
509+ )
507510 }
508511 }
509512
Original file line number Diff line number Diff line change 136136 <dimen name =" button_corner_radius" >24dp</dimen >
137137 <dimen name =" status_corner_radius" >12dp</dimen >
138138 <dimen name =" backup_button_width" >160dp</dimen >
139- <dimen name =" settings_activity_padding" >24dp</dimen >
140139 <integer name =" media_grid_width" >4</integer >
141140 <dimen name =" account_action_button_margin" >12dp</dimen >
142141 <dimen name =" account_action_button_height" >50dp</dimen >
Original file line number Diff line number Diff line change 11601160 <string name =" uploader_upload_failed_sync_conflict_error" >File upload conflict</string >
11611161 <string name =" uploader_upload_failed_sync_conflict_error_content" >Pick which version to keep of %1$s</string >
11621162 <string name =" upload_list_resolve_conflict" >Resolve conflict</string >
1163- <string name =" upload_list_cancel_upload" >Cancel upload</string >
11641163 <string name =" upload_list_delete" >Delete</string >
11651164 <string name =" create_new" >New</string >
11661165 <string name =" editor_placeholder" translatable =" false" >%1$s %2$s</string >
You can’t perform that action at this time.
0 commit comments