Przeglądaj źródła

Added resource prefix

Vadik Sirekanyan 2 lat temu
rodzic
commit
13bf7fe554

+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -10,7 +10,7 @@
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="false"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:label="@string/outln_app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Outline"

+ 1 - 1
app/src/main/java/org/sirekanyan/outline/MainContent.kt

@@ -52,7 +52,7 @@ fun MainContent(api: OutlineApi, dao: ApiUrlDao, state: MainState) {
                     }
                 }
                 MainTopAppBar(
-                    title = stringResource(R.string.app_name),
+                    title = stringResource(R.string.outln_app_name),
                     onMenuClick = state::openDrawer,
                 )
             }

+ 3 - 3
app/src/main/java/org/sirekanyan/outline/MainTopAppBar.kt

@@ -2,7 +2,7 @@ package org.sirekanyan.outline
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Menu
-import androidx.compose.material.icons.outlined.MoreVert
+import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -45,13 +45,13 @@ private fun MainMenu(items: List<MenuItem>) {
     if (items.isNotEmpty()) {
         var isMenuVisible by remember { mutableStateOf(false) }
         IconButton({ isMenuVisible = !isMenuVisible }) {
-            Icon(Icons.Outlined.MoreVert, null)
+            Icon(Icons.Default.MoreVert, null)
         }
         DropdownMenu(isMenuVisible, { isMenuVisible = false }) {
             items.forEach { (text, icon, onClick) ->
                 DropdownMenuItem(
                     text = { Text(text) },
-                    trailingIcon = { Icon(icon, null) },
+                    leadingIcon = { Icon(icon, null) },
                     onClick = {
                         isMenuVisible = false
                         onClick()

+ 2 - 2
app/src/main/java/org/sirekanyan/outline/ui/AddKeyButton.kt

@@ -15,7 +15,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material.icons.filled.Add
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
@@ -41,7 +41,7 @@ fun AddKeyButton(isVisible: Boolean, isLoading: Boolean, onClick: () -> Unit) {
                     if (isLoading) {
                         CircularProgressIndicator(Modifier.size(24.dp), strokeWidth = 2.dp)
                     } else {
-                        Icon(Icons.Outlined.Add, null)
+                        Icon(Icons.Default.Add, null)
                         Spacer(Modifier.width(12.dp))
                         Text("Add key")
                         Spacer(Modifier.width(4.dp))

+ 1 - 1
app/src/main/java/org/sirekanyan/outline/ui/DrawerContent.kt

@@ -60,7 +60,7 @@ private fun DrawerSheetContent(dao: ApiUrlDao, state: MainState, insets: Padding
             .padding(bottom = 8.dp),
     ) {
         Text(
-            text = stringResource(R.string.app_name),
+            text = stringResource(R.string.outln_app_name),
             modifier = Modifier.padding(horizontal = 28.dp, vertical = 16.dp),
             style = MaterialTheme.typography.titleSmall,
         )

+ 29 - 0
app/src/main/java/org/sirekanyan/outline/ui/icons/IconSort.kt

@@ -0,0 +1,29 @@
+package org.sirekanyan.outline.ui.icons
+
+import androidx.compose.material.icons.materialIcon
+import androidx.compose.material.icons.materialPath
+import androidx.compose.ui.graphics.vector.ImageVector
+
+val IconSort: ImageVector =
+    materialIcon(name = "Filled.Sort") {
+        materialPath {
+            moveTo(3.0f, 18.0f)
+            horizontalLineToRelative(6.0f)
+            verticalLineToRelative(-2.0f)
+            lineTo(3.0f, 16.0f)
+            verticalLineToRelative(2.0f)
+            close()
+            moveTo(3.0f, 6.0f)
+            verticalLineToRelative(2.0f)
+            horizontalLineToRelative(18.0f)
+            lineTo(21.0f, 6.0f)
+            lineTo(3.0f, 6.0f)
+            close()
+            moveTo(3.0f, 13.0f)
+            horizontalLineToRelative(12.0f)
+            verticalLineToRelative(-2.0f)
+            lineTo(3.0f, 11.0f)
+            verticalLineToRelative(2.0f)
+            close()
+        }
+    }

+ 4 - 1
app/src/main/res/values/strings.xml

@@ -1,3 +1,6 @@
 <resources>
-    <string name="app_name">Outline Manager</string>
+    <string name="outln_app_name">Outline Manager</string>
+    <string name="outln_sorting_by_id">Id</string>
+    <string name="outln_sorting_by_name">Name</string>
+    <string name="outln_sorting_by_traffic">Traffic</string>
 </resources>