Browse Source

UI fixes

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 1 year ago
parent
commit
bab532149d

+ 6 - 15
app/src/main/java/com/nextcloud/client/assistant/component/TaskView.kt

@@ -75,30 +75,21 @@ fun TaskView(
     ) {
     ) {
         Spacer(modifier = Modifier.height(8.dp))
         Spacer(modifier = Modifier.height(8.dp))
 
 
-        Text(
-            text = stringResource(id = R.string.assistant_screen_task_view_input),
-            color = Color.White
-        )
-
         task.input?.let {
         task.input?.let {
             Text(
             Text(
-                text = it,
+                text = stringResource(id = R.string.assistant_screen_task_view_input, it),
                 color = Color.White
                 color = Color.White
             )
             )
         }
         }
 
 
-        Spacer(modifier = Modifier.height(4.dp))
-        HorizontalDivider()
-        Spacer(modifier = Modifier.height(4.dp))
-
-        Text(
-            text = stringResource(id = R.string.assistant_screen_task_view_output),
-            color = Color.White,
-        )
+        HorizontalDivider(modifier = Modifier.padding(horizontal = 4.dp, vertical = 8.dp))
 
 
         task.output?.let {
         task.output?.let {
             Text(
             Text(
-                text = if (expanded) it else it.take(100) + "...",
+                text = stringResource(
+                    id = R.string.assistant_screen_task_view_output,
+                    if (expanded) it else it.take(100) + "..."
+                ),
                 color = Color.White,
                 color = Color.White,
                 modifier = Modifier
                 modifier = Modifier
                     .animateContentSize(
                     .animateContentSize(

+ 0 - 1
app/src/main/java/com/nextcloud/ui/composeComponents/bottomSheet/MoreActionsBottomSheet.kt

@@ -19,7 +19,6 @@ import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Text
 import androidx.compose.material3.Text
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.Modifier

+ 2 - 2
app/src/main/res/values/strings.xml

@@ -36,8 +36,8 @@
 
 
     <string name="assistant_screen_create_task_alert_dialog_input_field_placeholder">Type some text</string>
     <string name="assistant_screen_create_task_alert_dialog_input_field_placeholder">Type some text</string>
 
 
-    <string name="assistant_screen_task_view_input">Input: </string>
-    <string name="assistant_screen_task_view_output">Output: </string>
+    <string name="assistant_screen_task_view_input">Input\n%s</string>
+    <string name="assistant_screen_task_view_output">Output\n%s</string>
     <string name="assistant_screen_task_view_show_more">Show more</string>
     <string name="assistant_screen_task_view_show_more">Show more</string>
     <string name="assistant_screen_task_view_show_less">Show less</string>
     <string name="assistant_screen_task_view_show_less">Show less</string>