Skip to content

Consistent icon styling #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kwasow merged 4 commits into from
Apr 6, 2026
Merged

Consistent icon styling #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
288f11f
Replaced icons with material icons
Kwasow Apr 6, 2026
e9a0c5e
Improved color selection
Kwasow Apr 6, 2026
790cb24
Updated metronome icon
Kwasow Apr 6, 2026
cdef02d
Updated icons license
Kwasow Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions app/src/main/java/com/kwasow/musekit/ui/App.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ package com.kwasow.musekit.ui

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.safeDrawingPadding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.MusicNote
import androidx.compose.material.icons.outlined.Settings
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
Expand All @@ -11,6 +14,7 @@ import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScope
import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteType
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.rememberVectorPainter
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.navigation.NavController
Expand Down Expand Up @@ -40,17 +44,17 @@ fun App() {
TopLevelRoute(
stringResource(id = R.string.tuning),
NoteFork,
painterResource(id = R.drawable.ic_note_fork),
rememberVectorPainter(Icons.Outlined.MusicNote),
),
TopLevelRoute(
stringResource(id = R.string.metronome),
Metronome,
painterResource(id = R.drawable.ic_metronome),
painterResource(R.drawable.ic_metronome),
),
TopLevelRoute(
stringResource(id = R.string.settings),
Settings,
painterResource(id = R.drawable.ic_settings),
rememberVectorPainter(Icons.Outlined.Settings),
),
)

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/kwasow/musekit/ui/components/SettingsSection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ fun SettingsSection(
title: String = "",
entries: @Composable ColumnScope.() -> Unit,
) {
val color = MaterialTheme.colorScheme.onPrimary
val color = MaterialTheme.colorScheme.surfaceContainerHigh

Column(modifier = Modifier.padding(16.dp)) {
if (title.isNotEmpty()) {
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/com/kwasow/musekit/ui/components/TunerView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import androidx.compose.foundation.layout.height
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.CheckCircle
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Icon
Expand All @@ -14,7 +16,6 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.unit.Dp
Expand All @@ -38,7 +39,7 @@ fun TunerView(
)

Icon(
painter = painterResource(id = R.drawable.ic_check_circle),
imageVector = Icons.Outlined.CheckCircle,
contentDescription = stringResource(id = R.string.contentDescription_tuner_check),
modifier = Modifier.size(48.dp),
tint =
Expand Down
10 changes: 6 additions & 4 deletions app/src/main/java/com/kwasow/musekit/ui/dialogs/LicenseDialogs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.KeyboardArrowRight
import androidx.compose.material.icons.outlined.KeyboardArrowRight
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
Expand All @@ -18,7 +21,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.kwasow.musekit.R
Expand Down Expand Up @@ -107,8 +109,8 @@ private fun LicenseList(openSubDialog: (String, Int) -> Unit) {

LicenseEntry(
name = stringResource(id = R.string.icons),
description = stringResource(id = R.string.mit),
file = R.raw.mit,
description = stringResource(id = R.string.apache),
file = R.raw.apache2,
openSubDialog = openSubDialog,
)
}
Expand Down Expand Up @@ -142,7 +144,7 @@ private fun LicenseEntry(
}

Icon(
painterResource(id = R.drawable.ic_arrow_right),
imageVector = Icons.AutoMirrored.Outlined.KeyboardArrowRight,
contentDescription = stringResource(id = R.string.contentDescription_right_arrow),
)
}
Expand Down
8 changes: 5 additions & 3 deletions app/src/main/java/com/kwasow/musekit/ui/screens/fork/NoteForkAutoScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.AddCircleOutline
import androidx.compose.material.icons.outlined.RemoveCircleOutline
import androidx.compose.material3.Button
import androidx.compose.material3.Card
import androidx.compose.material3.Icon
Expand All @@ -27,7 +30,6 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
Expand Down Expand Up @@ -173,7 +175,7 @@ private fun PitchSelectorContent(modifier: Modifier = Modifier) {
val automaticTunerPitch by viewModel.automaticTunerPitch.collectAsState()

Icon(
painter = painterResource(id = R.drawable.ic_minus_circle),
imageVector = Icons.Outlined.RemoveCircleOutline,
contentDescription = stringResource(id = R.string.contentDescription_decrease),
tint = MaterialTheme.colorScheme.primary,
modifier =
Expand All @@ -191,7 +193,7 @@ private fun PitchSelectorContent(modifier: Modifier = Modifier) {
)

Icon(
painter = painterResource(id = R.drawable.ic_plus_circle),
imageVector = Icons.Outlined.AddCircleOutline,
contentDescription = stringResource(id = R.string.contentDescription_increase),
tint = MaterialTheme.colorScheme.primary,
modifier =
Expand Down
14 changes: 9 additions & 5 deletions app/src/main/java/com/kwasow/musekit/ui/screens/fork/NoteForkManualScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.AddCircleOutline
import androidx.compose.material.icons.outlined.Delete
import androidx.compose.material.icons.outlined.RemoveCircleOutline
import androidx.compose.material.icons.outlined.Save
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Card
Expand All @@ -32,7 +37,6 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.font.FontWeight
Expand Down Expand Up @@ -227,7 +231,7 @@ private fun PresetPicker(
if (name != viewModel.defaultPreset.first) {
IconButton(onClick = { onRemovePreset(name) }) {
Icon(
painter = painterResource(id = R.drawable.ic_delete),
imageVector = Icons.Outlined.Delete,
contentDescription =
stringResource(
id = R.string.contentDescription_trash_can,
Expand Down Expand Up @@ -333,7 +337,7 @@ private fun PropertyCard(
) {
IconButton(onClick = onDecrease) {
Icon(
painter = painterResource(id = R.drawable.ic_minus_circle),
imageVector = Icons.Outlined.RemoveCircleOutline,
contentDescription =
stringResource(
id = R.string.contentDescription_decrease,
Expand All @@ -345,7 +349,7 @@ private fun PropertyCard(

IconButton(onClick = onIncrease) {
Icon(
painter = painterResource(id = R.drawable.ic_plus_circle),
imageVector = Icons.Outlined.AddCircleOutline,
contentDescription =
stringResource(
id = R.string.contentDescription_increase,
Expand Down Expand Up @@ -391,7 +395,7 @@ private fun AdditionalActions(
contentPadding = PaddingValues(16.dp),
) {
Icon(
painter = painterResource(id = R.drawable.ic_save),
imageVector = Icons.Outlined.Save,
contentDescription = stringResource(id = R.string.contentDescription_save),
modifier = Modifier.size(ButtonDefaults.IconSize),
)
Expand Down
14 changes: 9 additions & 5 deletions app/src/main/java/com/kwasow/musekit/ui/screens/metronome/MetronomeSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.AddCircleOutline
import androidx.compose.material.icons.outlined.Edit
import androidx.compose.material.icons.outlined.RemoveCircleOutline
import androidx.compose.material.icons.outlined.TouchApp
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Icon
Expand All @@ -26,7 +31,6 @@ import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
Expand Down Expand Up @@ -119,7 +123,7 @@ private fun TempoSetting(onOpenSetBeatDialog: () -> Unit) {
modifier = Modifier.padding(end = 8.dp),
) {
Icon(
painter = painterResource(id = R.drawable.ic_edit),
imageVector = Icons.Outlined.Edit,
contentDescription = stringResource(id = R.string.contentDescription_pen),
modifier = Modifier.size(ButtonDefaults.IconSize),
)
Expand All @@ -136,7 +140,7 @@ private fun TempoSetting(onOpenSetBeatDialog: () -> Unit) {
contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp),
) {
Icon(
painter = painterResource(id = R.drawable.ic_tap),
imageVector = Icons.Outlined.TouchApp,
contentDescription =
stringResource(
id = R.string.contentDescription_finger_tapping,
Expand Down Expand Up @@ -167,7 +171,7 @@ private fun BeatsSettings() {
onClick = { numberOfBeats?.let { viewModel.setNumberOfBeats(it - 1) } },
) {
Icon(
painter = painterResource(id = R.drawable.ic_minus_circle),
imageVector = Icons.Outlined.RemoveCircleOutline,
contentDescription = stringResource(id = R.string.contentDescription_decrease),
modifier = Modifier.size(28.dp),
)
Expand All @@ -182,7 +186,7 @@ private fun BeatsSettings() {
onClick = { numberOfBeats?.let { viewModel.setNumberOfBeats(it + 1) } },
) {
Icon(
painter = painterResource(id = R.drawable.ic_plus_circle),
imageVector = Icons.Outlined.AddCircleOutline,
contentDescription = stringResource(id = R.string.contentDescription_increase),
modifier = Modifier.size(28.dp),
)
Expand Down
17 changes: 12 additions & 5 deletions app/src/main/java/com/kwasow/musekit/ui/screens/settings/SettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.Notes
import androidx.compose.material.icons.outlined.Language
import androidx.compose.material.icons.outlined.Nightlight
import androidx.compose.material.icons.outlined.Notes
import androidx.compose.material.icons.outlined.Web
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedCard
Expand All @@ -26,6 +32,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.graphics.vector.rememberVectorPainter
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
Expand Down Expand Up @@ -109,7 +116,7 @@ private fun MainColumn(licenseDialog: LicenseDialogInfo) {

@Composable
private fun AppDetails(modifier: Modifier = Modifier) {
val color = MaterialTheme.colorScheme.onPrimary
val color = MaterialTheme.colorScheme.surfaceContainerHigh

Column(
modifier = modifier,
Expand Down Expand Up @@ -161,7 +168,7 @@ private fun ThemeSetting() {
val count = if (Build.VERSION.SDK_INT >= 29) 3 else 2

SettingsEntry(
icon = painterResource(id = R.drawable.ic_moon),
icon = rememberVectorPainter(Icons.Outlined.Nightlight),
iconDescription = stringResource(id = R.string.contentDescription_moon_icon),
name = stringResource(id = R.string.theme),
description = stringResource(id = R.string.theme_subtitle),
Expand Down Expand Up @@ -217,7 +224,7 @@ private fun NotationStyleSetting() {
val notationStyle by viewModel.notationStyle.collectAsState()

SettingsEntry(
icon = painterResource(id = R.drawable.ic_globe),
icon = rememberVectorPainter(Icons.Outlined.Language),
iconDescription = stringResource(id = R.string.contentDescription_localization),
name = stringResource(id = R.string.notation_style),
description = stringResource(id = R.string.notation_style_subtitle),
Expand Down Expand Up @@ -271,7 +278,7 @@ private fun AboutSection(onOpenLicenseDialog: () -> Unit) {
SettingsDivider()

SettingsEntry(
icon = painterResource(id = R.drawable.ic_web),
icon = rememberVectorPainter(Icons.Outlined.Web),
iconDescription = stringResource(id = R.string.contentDescription_internet_website),
name = stringResource(id = R.string.developer_website),
description = stringResource(id = R.string.developer_website_subtitle),
Expand All @@ -281,7 +288,7 @@ private fun AboutSection(onOpenLicenseDialog: () -> Unit) {
SettingsDivider()

SettingsEntry(
icon = painterResource(id = R.drawable.ic_file),
icon = rememberVectorPainter(Icons.AutoMirrored.Outlined.Notes),
iconDescription = stringResource(id = R.string.contentDescription_file_icon),
name = stringResource(id = R.string.licenses),
description = stringResource(id = R.string.licenses_subtitle),
Expand Down
10 changes: 0 additions & 10 deletions app/src/main/res/drawable/ic_arrow_right.xml
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions app/src/main/res/drawable/ic_check.xml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions app/src/main/res/drawable/ic_check_circle.xml
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions app/src/main/res/drawable/ic_delete.xml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions app/src/main/res/drawable/ic_edit.xml
View file
Open in desktop

This file was deleted.

Loading
Loading