Merge remote-tracking branch 'origin/A-13' into A-13

NeoApplications · Dec 4, 2023 · c2e0331 · c2e0331
2 parents e51c1aa + 54cc876
commit c2e0331
Show file tree

Hide file tree

Showing 11 changed files with 198 additions and 162 deletions.
diff --git a/Omega/res/values-ar/strings.xml b/Omega/res/values-ar/strings.xml
@@ -513,4 +513,7 @@
     <string name="title_calendar_persian">الفارسي</string>
     <string name="title_calendar_gregorian">الميلادي</string>
     <string name="about_community_matrix">المجتمع على ماتريكس</string>
+    <string name="hotseat_accessibility_expand">تن توسيع الرف</string>
+    <string name="hotseat_accessibility_collapse">تم طي الرف</string>
+    <string name="title_expandable_dock">رف قابل لتوسع</string>
 </resources>
diff --git a/Omega/res/values-de/strings.xml b/Omega/res/values-de/strings.xml
@@ -505,4 +505,7 @@
     <string name="about_community_matrix">Community auf Matrix</string>
     <string name="title_smartspace_time_format">Zeitformat</string>
     <string name="title_calendar_persian">Persisch</string>
+    <string name="hotseat_accessibility_expand">Dock ausgeklappt</string>
+    <string name="hotseat_accessibility_collapse">Dock eingeklappt</string>
+    <string name="title_expandable_dock">Ausklappbares Dock</string>
 </resources>
diff --git a/Omega/res/values-es/strings.xml b/Omega/res/values-es/strings.xml
@@ -507,4 +507,7 @@
     <string name="gesture_press_recents">Botón de Recientes</string>
     <string name="about_community_telegram">La Comunidad en Telegram</string>
     <string name="about_community_matrix">La Comunidad en Matrix</string>
+    <string name="hotseat_accessibility_expand">Dock expandido</string>
+    <string name="hotseat_accessibility_collapse">Dock colapsado</string>
+    <string name="title_expandable_dock">Dock Ampliable</string>
 </resources>
diff --git a/Omega/res/values-it/strings.xml b/Omega/res/values-it/strings.xml
@@ -522,4 +522,7 @@
     <string name="title_smartspace_calendar">Seleziona calendario</string>
     <string name="gesture_press_recents">Pulsante recenti</string>
     <string name="about_community_matrix">Comunità su Matrix</string>
+    <string name="hotseat_accessibility_expand">Barra app aperta</string>
+    <string name="hotseat_accessibility_collapse">Barra app chiusa</string>
+    <string name="title_expandable_dock">Barra app espandibile</string>
 </resources>
diff --git a/Omega/res/values-ru/strings.xml b/Omega/res/values-ru/strings.xml
@@ -192,7 +192,7 @@
     <string name="icon_shape_circle">Круг</string>
     <string name="icon_shape_squircle">Скругленный квадрат</string>
     <string name="icon_shape_square">Квадрат</string>
-    <string name="icon_shape_system_default">Система</string>
+    <string name="icon_shape_system_default">Системная</string>
     <string name="icon_shape_override_label_location">на домашнем экране</string>
     <string name="icon_shape_override_label">Изменить форму иконки</string>
     <string name="icon_shape_override_progress">Применение изменений формы иконки</string>
@@ -212,7 +212,7 @@
     <string name="theme_with_dark_text">темный текст</string>
     <string name="theme_light">Светлый</string>
     <string name="theme_based">Задано темой</string>
-    <string name="theme_auto_night_mode">Система</string>
+    <string name="theme_auto_night_mode">Как в системе</string>
     <string name="theme_auto">В соответствии с обоями</string>
     <string name="summary__theme_blur">Размытие фона страницы</string>
     <string name="title_theme_icon_packs">Наборы иконок</string>
@@ -365,7 +365,7 @@
     <string name="trust_apps_manager_name">Скрытые и защищенные приложения</string>
     <string name="enable_protected_apps">Включить защищенные приложения</string>
     <string name="disable_protected_apps_message">Отключить защищенные приложения, требующие аутентификации</string>
-    <string name="theme_auto_night_mode_black">Система (черная)</string>
+    <string name="theme_auto_night_mode_black">Как в системе (чёрная)</string>
     <string name="about_community">Сообщество</string>
     <string name="dash_bluetooth">Bluetooth</string>
     <string name="pref_desktop_mode">Режим рабочего стола</string>
@@ -509,4 +509,7 @@
     <string name="web_search_neeva">Neeva (Веб)</string>
     <string name="web_search_wolfram_alpha">Wolfram Alpha (Веб)</string>
     <string name="web_search_perplexity">Perplexity (Веб)</string>
+    <string name="hotseat_accessibility_expand">Панель развёрнута</string>
+    <string name="hotseat_accessibility_collapse">Панель свёрнута</string>
+    <string name="title_expandable_dock">Разворачиваемая панель</string>
 </resources>
diff --git a/Omega/res/values-zh-rTW/strings.xml b/Omega/res/values-zh-rTW/strings.xml
@@ -500,4 +500,7 @@
     <string name="web_search_phind">Phind（網頁）</string>
     <string name="web_search_perplexity">Perplexity（網頁）</string>
     <string name="web_search_searx">Searx（網頁）</string>
+    <string name="hotseat_accessibility_expand">Dock 展開</string>
+    <string name="hotseat_accessibility_collapse">Dock 收起</string>
+    <string name="title_expandable_dock">擴展 Dock</string>
 </resources>
diff --git a/Omega/src/com/saggitt/omega/compose/components/DialogButton.kt b/Omega/src/com/saggitt/omega/compose/components/DialogButton.kt
@@ -18,10 +18,12 @@
 
 package com.saggitt.omega.compose.components
 
+import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
@@ -38,14 +40,15 @@ fun DialogPositiveButton(
     textId: Int = android.R.string.ok,
     onClick: () -> Unit = {},
 ) {
-    TextButton(
+    OutlinedButton(
         shape = RoundedCornerShape(cornerRadius),
         onClick = onClick,
         modifier = modifier,
-        colors = ButtonDefaults.buttonColors(
-            containerColor = MaterialTheme.colorScheme.primary,
+            colors = ButtonDefaults.outlinedButtonColors(
+                    containerColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.35F),
             contentColor = MaterialTheme.colorScheme.onPrimary
-        )
+            ),
+            border = BorderStroke(1.dp, MaterialTheme.colorScheme.primary.copy(alpha = 0.65F))
     ) {
         Text(
             text = stringResource(id = textId),

diff --git a/Omega/src/com/saggitt/omega/compose/components/ListItem.kt b/Omega/src/com/saggitt/omega/compose/components/ListItem.kt
@@ -22,6 +22,7 @@ import androidx.compose.foundation.clickable
 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.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -55,8 +56,9 @@ fun SingleSelectionListItem(
 ) {
     Row(
         modifier = modifier
-            .fillMaxWidth()
-            .clickable(onClick = onClick, enabled = isEnabled),
+                .fillMaxWidth()
+                .height(48.dp)
+                .clickable(onClick = onClick, enabled = isEnabled),
         verticalAlignment = Alignment.CenterVertically
     ) {
         RadioButton(
@@ -79,7 +81,6 @@ fun SingleSelectionListItem(
         if (endWidget != null) {
             Spacer(modifier = Modifier.width(8.dp))
             endWidget()
-            Spacer(modifier = Modifier.width(8.dp))
         }
     }
 }
@@ -110,22 +111,25 @@ fun MultiSelectionListItem(
 
     Row(
         modifier = modifier
-            .padding(start = 16.dp)
-            .fillMaxWidth()
-            .clickable(onClick = { onClick(!isChecked) }, enabled = isEnabled),
+                .fillMaxWidth()
+                .height(56.dp)
+                .clickable(onClick = { onClick(!isChecked) }, enabled = isEnabled),
         verticalAlignment = Alignment.CenterVertically
     ) {
         if (withIcon) iconIds[iconId]?.let {
+            Spacer(modifier = Modifier.width(16.dp))
             Icon(
-                modifier = Modifier.size(32.dp),
+                    modifier = Modifier
+                            .size(32.dp),
                 painter = painterResource(id = it),
                 contentDescription = text,
             )
-            Spacer(modifier = Modifier.width(12.dp))
         }
         else checkbox()
         Text(
-            modifier = Modifier.weight(1f),
+                modifier = Modifier
+                        .weight(1f)
+                        .padding(start = 12.dp),
             text = text,
             fontSize = 16.sp,
             fontWeight = FontWeight.Bold