Skip to content

Commit 2109779

Browse files
committed
画面のアイコンを同梱のベクター画像に置き換え
- 外部のアイコン集への依存を避け、必要な2点のみをリソースとして同梱 - アイコンに読み上げ用の説明文を付与 https://claude.ai/code/session_01TbRomX8cQTi7d8w5hEBMQd
1 parent ffa6584 commit 2109779

4 files changed

Lines changed: 29 additions & 6 deletions

File tree

app/src/main/kotlin/info/nukoneko/cuc/android/kidspos/ui/main/MainScreen.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
1111
import androidx.compose.foundation.layout.padding
1212
import androidx.compose.foundation.lazy.LazyColumn
1313
import androidx.compose.foundation.lazy.items
14-
import androidx.compose.material.icons.Icons
15-
import androidx.compose.material.icons.filled.Menu
1614
import androidx.compose.material3.Button
1715
import androidx.compose.material3.HorizontalDivider
1816
import androidx.compose.material3.DrawerValue
@@ -32,6 +30,7 @@ import androidx.compose.runtime.rememberCoroutineScope
3230
import androidx.compose.ui.Alignment
3331
import androidx.compose.ui.Modifier
3432
import androidx.compose.ui.platform.LocalContext
33+
import androidx.compose.ui.res.painterResource
3534
import androidx.compose.ui.text.font.FontWeight
3635
import androidx.compose.ui.unit.dp
3736
import androidx.hilt.navigation.compose.hiltViewModel
@@ -113,7 +112,10 @@ fun MainScreen(
113112
title = { Text("$appName$titleSuffix") },
114113
navigationIcon = {
115114
IconButton(onClick = { scope.launch { drawerState.open() } }) {
116-
Icon(Icons.Filled.Menu, contentDescription = null)
115+
Icon(
116+
painterResource(R.drawable.ic_menu),
117+
contentDescription = context.getString(R.string.navigation_drawer_open)
118+
)
117119
}
118120
}
119121
)

app/src/main/kotlin/info/nukoneko/cuc/android/kidspos/ui/settings/SettingsScreen.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import androidx.compose.foundation.layout.Spacer
77
import androidx.compose.foundation.layout.fillMaxSize
88
import androidx.compose.foundation.layout.fillMaxWidth
99
import androidx.compose.foundation.layout.padding
10-
import androidx.compose.material.icons.Icons
11-
import androidx.compose.material.icons.automirrored.filled.ArrowBack
1210
import androidx.compose.material3.Button
1311
import androidx.compose.material3.ExperimentalMaterial3Api
1412
import androidx.compose.material3.Icon
@@ -21,6 +19,7 @@ import androidx.compose.runtime.Composable
2119
import androidx.compose.runtime.getValue
2220
import androidx.compose.ui.Modifier
2321
import androidx.compose.ui.platform.LocalContext
22+
import androidx.compose.ui.res.painterResource
2423
import androidx.compose.ui.unit.dp
2524
import androidx.hilt.navigation.compose.hiltViewModel
2625
import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -51,7 +50,10 @@ fun SettingsScreen(
5150
title = { Text(context.getString(R.string.drawer_setting)) },
5251
navigationIcon = {
5352
IconButton(onClick = onNavigateBack) {
54-
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
53+
Icon(
54+
painterResource(R.drawable.ic_arrow_back),
55+
contentDescription = context.getString(R.string.back)
56+
)
5557
}
5658
}
5759
)
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24"
6+
android:autoMirrored="true">
7+
<path
8+
android:fillColor="@android:color/black"
9+
android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
10+
</vector>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:fillColor="@android:color/black"
8+
android:pathData="M3,18h18v-2H3v2zM3,13h18v-2H3v2zM3,6v2h18V6H3z" />
9+
</vector>

0 commit comments

Comments
 (0)