wip

app/src/main/java/org/grakovne/lissen/ui/screens/settings/advanced/CustomHeaderComposable.kt

@@ -1,23 +1,32 @@
 package org.grakovne.lissen.ui.screens.settings.advanced
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.DeleteOutline
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.MaterialTheme.colorScheme
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import org.grakovne.lissen.R
@@ -29,48 +38,53 @@ fun CustomHeaderComposable(
     onChanged: (ServerCustomHeader) -> Unit,
     onDelete: (ServerCustomHeader) -> Unit
 ) {
-    Row(
+
+    Card(
+        shape = RoundedCornerShape(12.dp),
         modifier = Modifier
             .fillMaxWidth()
             .padding(horizontal = 16.dp),
-        verticalAlignment = Alignment.CenterVertically
+        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
     ) {
-        Column(
-            modifier = Modifier.weight(1f)
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(colorScheme.surfaceContainer)
+                .padding(start = 16.dp, end = 0.dp, top = 16.dp, bottom = 16.dp),
+            verticalAlignment = Alignment.CenterVertically
         ) {
-            OutlinedTextField(
-                value = header.name,
-                onValueChange = { onChanged(header.copy(name = it, value = header.value)) },
-                label = { Text(stringResource(R.string.custom_header_hint_name)) },
-                singleLine = true,
-                shape = RoundedCornerShape(16.dp),
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(vertical = 4.dp)
-            )
-
-            OutlinedTextField(
-                value = header.value,
-                onValueChange = { onChanged(header.copy(name = header.name, value = it)) },
-                label = { Text(stringResource(R.string.custom_header_hint_value)) },
-                singleLine = true,
-                shape = RoundedCornerShape(16.dp),
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(vertical = 4.dp)
-            )
-        }
+            Column(
+                modifier = Modifier.weight(1f)
+            ) {
+                OutlinedTextField(
+                    value = header.name,
+                    onValueChange = { onChanged(header.copy(name = it, value = header.value)) },
+                    label = { Text(stringResource(R.string.custom_header_hint_name)) },
+                    singleLine = true,
+                    shape = RoundedCornerShape(16.dp),
+                    modifier = Modifier.fillMaxWidth()
+                )
 
-        Spacer(modifier = Modifier.width(16.dp))
+                OutlinedTextField(
+                    value = header.value,
+                    onValueChange = { onChanged(header.copy(name = header.name, value = it)) },
+                    label = { Text(stringResource(R.string.custom_header_hint_value)) },
+                    singleLine = true,
+                    shape = RoundedCornerShape(16.dp),
+                    modifier = Modifier.fillMaxWidth()
+                )
+            }
 
-        IconButton(
-            onClick = { onDelete(header) }
-        ) {
-            Icon(
-                imageVector = Icons.Default.DeleteOutline,
-                contentDescription = null,
-                modifier = Modifier.size(36.dp)
-            )
+            IconButton(
+                onClick = { onDelete(header) }
+            ) {
+                Icon(
+                    imageVector = Icons.Default.DeleteOutline,
+                    contentDescription = null,
+                    tint = colorScheme.error,
+                    modifier = Modifier.size(24.dp)
+                )
+            }
         }
     }
 

app/src/main/java/org/grakovne/lissen/ui/screens/settings/advanced/CustomHeadersSettingsScreen.kt

@@ -10,6 +10,7 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.ArrowBack
 import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.outlined.Add
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FabPosition
 import androidx.compose.material3.FloatingActionButton

app/src/main/res/values-ru/strings.xml

@@ -48,7 +48,7 @@
     <string name="library_search_hint">Поиск по автору или названию</string>
     <string name="player_screen_title">Сейчас играет</string>
     <string name="settings_screen_custom_headers_title">Прокси-заголовки</string>
-    <string name="settings_screen_custom_header_hint">Заголовки для подключения к серверу</string>
+    <string name="settings_screen_custom_header_hint">Заголовки</string>
     <string name="custom_header_hint_name">Ключ</string>
     <string name="custom_header_hint_value">Значение</string>
     <string name="custom_headers_title">Прокси-заголовки</string>