Replaced hard coded icons with constants

2023-03-08 01:41:10 +01:00 · 2023-03-08 01:41:10 +01:00 · 07c857304b
commit 07c857304b
parent 0cbee60427
32 changed files with 162 additions and 83 deletions
--- a/src/main/kotlin/com/jetpackduba/gitnuro/App.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/App.kt
@ -112,7 +112,7 @@ class App {
                        isOpen = false
                    },
                    state = windowState,
-                    icon = painterResource("logo.svg"),
+                    icon = painterResource(AppIcons.LOGO),
                ) {
                    val density = if (scale != -1f) {
                        arrayOf(LocalDensity provides Density(scale, 1f))
--- a/src/main/kotlin/com/jetpackduba/gitnuro/Icons.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/Icons.kt
@ -0,0 +1,49 @@
+package com.jetpackduba.gitnuro
+
+object AppIcons {
+    const val ADD = "add.svg"
+    const val ALIGN_TOP = "align_top.svg"
+    const val APPLY_STASH = "apply_stash.svg"
+    const val BINARY = "binary.svg"
+    const val BLAME = "blame.svg"
+    const val BOLT = "bolt.svg"
+    const val BRANCH = "branch.svg"
+    const val BUG = "bug.svg"
+    const val CHEVRON_RIGHT = "chevron_right.svg"
+    const val CLOSE = "close.svg"
+    const val CLOUD = "cloud.svg"
+    const val CODE = "code.svg"
+    const val COMPUTER = "computer.svg"
+    const val DELETE = "delete.svg"
+    const val DOWNLOAD = "download.svg"
+    const val DROPDOWN = "dropdown.svg"
+    const val ERROR = "error.svg"
+    const val EXPAND_MORE = "expand_more.svg"
+    const val FETCH = "fetch.svg"
+    const val GRADE = "grade.svg"
+    const val HISTORY = "history.svg"
+    const val INFO = "info.svg"
+    const val KEY = "key.svg"
+    const val LOCATION = "location.svg"
+    const val LOCK = "lock.svg"
+    const val LOGO = "logo.svg"
+    const val MERGE = "merge.svg"
+    const val MORE_VERT = "more_vert.svg"
+    const val OPEN = "open.svg"
+    const val REFRESH = "refresh.svg"
+    const val REMOVE = "remove.svg"
+    const val REVERT = "revert.svg"
+    const val SEARCH = "search.svg"
+    const val SETTINGS = "settings.svg"
+    const val SOURCE = "source.svg"
+    const val START = "start.svg"
+    const val STASH = "stash.svg"
+    const val TAG = "tag.svg"
+    const val TERMINAL = "terminal.svg"
+    const val TOPIC = "topic.svg"
+    const val UNDO = "undo.svg"
+    const val UPLOAD = "upload.svg"
+    const val VISIBILITY = "visibility.svg"
+    const val VISIBILITY_OFF = "visibility_off.svg"
+    const val WARNING = "warning.svg"
+}
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/AppTab.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/AppTab.kt
@ -15,6 +15,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.LoadingRepository
 import com.jetpackduba.gitnuro.LocalTabScope
 import com.jetpackduba.gitnuro.credentials.CredentialsAccepted
@ -130,7 +131,7 @@ fun AppTab(
                        Spacer(modifier = Modifier.weight(1f))

                        Icon(
-                            painterResource("error.svg"),
+                            painterResource(AppIcons.ERROR),
                            contentDescription = null,
                            tint = MaterialTheme.colors.error,
                            modifier = Modifier.size(24.dp)
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/Blame.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Blame.kt
@ -23,6 +23,7 @@ import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.input.key.onPreviewKeyEvent
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.extensions.*
 import com.jetpackduba.gitnuro.keybindings.KeybindingOption
 import com.jetpackduba.gitnuro.keybindings.matchesBinding
@ -185,7 +186,7 @@ fun MinimizedBlame(
                .handOnHover()
        ) {
            Image(
-                painter = painterResource("close.svg"),
+                painter = painterResource(AppIcons.CLOSE),
                contentDescription = "Close blame",
                colorFilter = ColorFilter.tint(MaterialTheme.colors.onBackground),
            )
@ -220,7 +221,7 @@ private fun Header(
                .handOnHover()
        ) {
            Image(
-                painter = painterResource("close.svg"),
+                painter = painterResource(AppIcons.CLOSE),
                contentDescription = "Close blame",
                colorFilter = ColorFilter.tint(MaterialTheme.colors.onBackground),
            )
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/FileHistory.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/FileHistory.kt
@ -21,6 +21,7 @@ import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.input.key.onKeyEvent
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.extensions.handMouseClickable
 import com.jetpackduba.gitnuro.extensions.handOnHover
 import com.jetpackduba.gitnuro.extensions.toSmartSystemString
@ -103,7 +104,7 @@ private fun Header(
                .handOnHover()
        ) {
            Image(
-                painter = painterResource("close.svg"),
+                painter = painterResource(AppIcons.CLOSE),
                contentDescription = "Close history",
                colorFilter = ColorFilter.tint(MaterialTheme.colors.onBackground),
            )
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/Menu.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Menu.kt
@ -18,6 +18,7 @@ import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.extensions.handMouseClickable
 import com.jetpackduba.gitnuro.extensions.handOnHover
 import com.jetpackduba.gitnuro.extensions.ignoreKeyEvents
@ -45,7 +46,7 @@ fun Menu(
            modifier = Modifier
                .padding(start = 16.dp),
            title = "Open",
-            icon = painterResource("open.svg"),
+            icon = painterResource(AppIcons.OPEN),
            onClick = onOpenAnotherRepository,
        )

@ -54,7 +55,7 @@ fun Menu(
        ExtendedMenuButton(
            modifier = Modifier.padding(end = 4.dp),
            title = "Pull",
-            icon = painterResource("download.svg"),
+            icon = painterResource(AppIcons.DOWNLOAD),
            onClick = { menuViewModel.pull() },
            extendedListItems = pullContextMenuItems(
                onPullRebase = {
@ -68,7 +69,7 @@ fun Menu(

        ExtendedMenuButton(
            title = "Push",
-            icon = painterResource("upload.svg"),
+            icon = painterResource(AppIcons.UPLOAD),
            onClick = { menuViewModel.push() },
            extendedListItems = pushContextMenuItems(
                onPushWithTags = {
@ -84,7 +85,7 @@ fun Menu(

        MenuButton(
            title = "Branch",
-            icon = painterResource("branch.svg"),
+            icon = painterResource(AppIcons.BRANCH),
        ) {
            onCreateBranch()
        }
@ -101,7 +102,7 @@ fun Menu(
        ExtendedMenuButton(
            modifier = Modifier.padding(end = 4.dp),
            title = "Stash",
-            icon = painterResource("stash.svg"),
+            icon = painterResource(AppIcons.STASH),
            onClick = { menuViewModel.stash() },
            extendedListItems = stashContextMenuItems(
                onStashWithMessage = onStashWithMessage
@ -110,7 +111,7 @@ fun Menu(

        MenuButton(
            title = "Pop",
-            icon = painterResource("apply_stash.svg"),
+            icon = painterResource(AppIcons.APPLY_STASH),
        ) { menuViewModel.popStash() }

        Spacer(modifier = Modifier.weight(1f))
@ -125,14 +126,14 @@ fun Menu(
        MenuButton(
            modifier = Modifier.padding(end = 4.dp),
            title = "Actions",
-            icon = painterResource("bolt.svg"),
+            icon = painterResource(AppIcons.BOLT),
            onClick = onQuickActions,
        )

        MenuButton(
            modifier = Modifier.padding(end = 16.dp),
            title = "Settings",
-            icon = painterResource("settings.svg"),
+            icon = painterResource(AppIcons.SETTINGS),
            onClick = onShowSettingsDialog,
        )
    }
@ -225,7 +226,7 @@ fun ExtendedMenuButton(
        ) {

            Icon(
-                painterResource("expand_more.svg"),
+                painterResource(AppIcons.EXPAND_MORE),
                contentDescription = null,
                tint = MaterialTheme.colors.onBackground,
                modifier = Modifier.size(16.dp)
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/RebaseInteractive.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/RebaseInteractive.kt
@ -11,6 +11,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.ui.components.AdjustableOutlinedTextField
 import com.jetpackduba.gitnuro.ui.components.PrimaryButton
 import com.jetpackduba.gitnuro.ui.components.ScrollableLazyColumn
@ -180,7 +181,7 @@ fun ActionDropdown(
            )

            Icon(
-                painterResource("expand_more.svg"),
+                painterResource(AppIcons.EXPAND_MORE),
                contentDescription = null,
                modifier = Modifier.size(20.dp),
                tint = MaterialTheme.colors.onBackground,
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/SidePanel.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/SidePanel.kt
@ -11,6 +11,7 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.extensions.handOnHover
 import com.jetpackduba.gitnuro.extensions.isLocal
 import com.jetpackduba.gitnuro.extensions.simpleName
@ -110,7 +111,7 @@ fun FilterTextField(value: String, onValueChange: (String) -> Unit, modifier: Mo
        maxLines = 1,
        leadingIcon = {
            Icon(
-                painterResource("search.svg"),
+                painterResource(AppIcons.SEARCH),
                contentDescription = null,
                modifier = Modifier.size(16.dp),
                tint = if (value.isEmpty()) MaterialTheme.colors.onBackgroundSecondary else MaterialTheme.colors.onBackground
@ -133,7 +134,7 @@ fun LazyListScope.localBranches(
        ) {
            SideMenuHeader(
                text = "Local branches",
-                icon = painterResource("branch.svg"),
+                icon = painterResource(AppIcons.BRANCH),
                itemsCount = branches.count(),
                hoverIcon = null,
                isExpanded = isExpanded,
@ -175,7 +176,7 @@ fun LazyListScope.remotes(
        ) {
            SideMenuHeader(
                text = "Remotes",
-                icon = painterResource("cloud.svg"),
+                icon = painterResource(AppIcons.CLOUD),
                itemsCount = remotes.count(),
                hoverIcon = {
                    IconButton(
@ -186,7 +187,7 @@ fun LazyListScope.remotes(
                            .handOnHover(),
                    ) {
                        Icon(
-                            painter = painterResource("settings.svg"),
+                            painter = painterResource(AppIcons.SETTINGS),
                            contentDescription = null,
                            modifier = Modifier
                                .fillMaxSize(),
@ -236,7 +237,7 @@ fun LazyListScope.tags(
        ) {
            SideMenuHeader(
                text = "Tags",
-                icon = painterResource("tag.svg"),
+                icon = painterResource(AppIcons.TAG),
                itemsCount = tags.count(),
                hoverIcon = null,
                isExpanded = isExpanded,
@ -272,7 +273,7 @@ fun LazyListScope.stashes(
        ) {
            SideMenuHeader(
                text = "Stashes",
-                icon = painterResource("stash.svg"),
+                icon = painterResource(AppIcons.STASH),
                itemsCount = stashes.count(),
                hoverIcon = null,
                isExpanded = isExpanded,
@ -307,7 +308,7 @@ fun LazyListScope.submodules(
        ) {
            SideMenuHeader(
                text = "Submodules",
-                icon = painterResource("topic.svg"),
+                icon = painterResource(AppIcons.TOPIC),
                itemsCount = submodules.count(),
                hoverIcon = null,
                isExpanded = isExpanded,
@ -358,7 +359,7 @@ private fun Branch(
    ) {
        SideMenuSubentry(
            text = branch.simpleName,
-            iconResourcePath = "branch.svg",
+            iconResourcePath = AppIcons.BRANCH,
            onClick = onBranchClicked,
            onDoubleClick = onBranchDoubleClicked,
        ) {
@ -382,7 +383,7 @@ private fun Remote(
 ) {
    SideMenuSubentry(
        text = remote.remoteInfo.remoteConfig.name,
-        iconResourcePath = "cloud.svg",
+        iconResourcePath = AppIcons.CLOUD,
        onClick = onRemoteClicked
    )
 }
@ -404,7 +405,7 @@ private fun RemoteBranches(
        SideMenuSubentry(
            text = remoteBranch.simpleName,
            extraPadding = 24.dp,
-            iconResourcePath = "branch.svg",
+            iconResourcePath = AppIcons.BRANCH,
            onClick = onBranchClicked
        )
    }
@ -427,7 +428,7 @@ private fun Tag(
    ) {
        SideMenuSubentry(
            text = tag.simpleName,
-            iconResourcePath = "tag.svg",
+            iconResourcePath = AppIcons.TAG,
            onClick = onTagClicked,
        )
    }
@ -453,7 +454,7 @@ private fun Stash(
    ) {
        SideMenuSubentry(
            text = stash.shortMessage,
-            iconResourcePath = "stash.svg",
+            iconResourcePath = AppIcons.STASH,
            onClick = onClick,
        )
    }
@ -474,7 +475,7 @@ private fun Submodule(
    ) {
        SideMenuSubentry(
            text = submodulePair.first,
-            iconResourcePath = "topic.svg",
+            iconResourcePath = AppIcons.TOPIC,
        ) {
            val stateName = submodulePair.second.type.toString()
            Tooltip(stateName) {
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/WelcomePage.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/WelcomePage.kt
@ -21,6 +21,7 @@ import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.jetpackduba.gitnuro.AppConstants
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.AppStateManager
 import com.jetpackduba.gitnuro.extensions.*
 import com.jetpackduba.gitnuro.theme.onBackgroundSecondary
@ -109,20 +110,20 @@ fun HomeButtons(
        ButtonTile(
            modifier = Modifier.padding(bottom = 8.dp),
            title = "Open a repository",
-            painter = painterResource("open.svg"),
+            painter = painterResource(AppIcons.OPEN),
            onClick = { openRepositoryDialog(tabViewModel) })

        ButtonTile(
            modifier = Modifier.padding(bottom = 8.dp),
            title = "Clone a repository",
-            painter = painterResource("download.svg"),
+            painter = painterResource(AppIcons.DOWNLOAD),
            onClick = onShowCloneView
        )

        ButtonTile(
            modifier = Modifier.padding(bottom = 8.dp),
            title = "Start a local repository",
-            painter = painterResource("open.svg"),
+            painter = painterResource(AppIcons.OPEN),
            onClick = {
                val dir = openDirectoryDialog()
                if (dir != null) tabViewModel.initLocalRepository(dir)
@ -137,7 +138,7 @@ fun HomeButtons(

        IconTextButton(
            title = "Source code",
-            painter = painterResource("code.svg"),
+            painter = painterResource(AppIcons.CODE),
            onClick = {
                openUrlInBrowser("https://github.com/JetpackDuba/Gitnuro")
            }
@ -145,7 +146,7 @@ fun HomeButtons(

        IconTextButton(
            title = "Report a bug",
-            painter = painterResource("bug.svg"),
+            painter = painterResource(AppIcons.BUG),
            onClick = {
                openUrlInBrowser("https://github.com/JetpackDuba/Gitnuro/issues")
            }
@ -153,20 +154,20 @@ fun HomeButtons(

        IconTextButton(
            title = "Additional information",
-            painter = painterResource("info.svg"),
+            painter = painterResource(AppIcons.INFO),
            onClick = onShowAdditionalInfo
        )

        IconTextButton(
            title = "Settings",
-            painter = painterResource("settings.svg"),
+            painter = painterResource(AppIcons.SETTINGS),
            onClick = onShowSettings
        )

        if (newUpdate != null) {
            IconTextButton(
                title = "New update ${newUpdate.appVersion} available ",
-                painter = painterResource("grade.svg"),
+                painter = painterResource(AppIcons.GRADE),
                iconColor = MaterialTheme.colors.secondary,
                onClick = {
                    openUrlInBrowser(newUpdate.downloadUrl)
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuEntry.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuEntry.kt
@ -17,6 +17,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.extensions.handMouseClickable

 import com.jetpackduba.gitnuro.theme.onBackgroundSecondary
@ -42,7 +43,7 @@ fun SideMenuHeader(
        verticalAlignment = Alignment.CenterVertically,
    ) {
        Icon(
-            painter = painterResource(if (isExpanded) "expand_more.svg" else "chevron_right.svg"),
+            painter = painterResource(if (isExpanded) AppIcons.EXPAND_MORE else AppIcons.CHEVRON_RIGHT),
            contentDescription = null,
            tint = MaterialTheme.colors.onBackground,
            modifier = Modifier
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/BranchContextMenu.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/BranchContextMenu.kt
@ -1,6 +1,7 @@
 package com.jetpackduba.gitnuro.ui.context_menu

 import androidx.compose.ui.res.painterResource
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.extensions.isHead
 import com.jetpackduba.gitnuro.extensions.simpleLogName
 import org.eclipse.jgit.lib.Ref
@ -23,7 +24,7 @@ fun branchContextMenuItems(
            add(
                ContextMenuElement.ContextTextEntry(
                    label = "Checkout branch",
-                    icon = { painterResource("start.svg") },
+                    icon = { painterResource(AppIcons.START) },
                    onClick = onCheckoutBranch
                )
            )
@ -48,7 +49,7 @@ fun branchContextMenuItems(
            add(
                ContextMenuElement.ContextTextEntry(
                    label = "Delete branch",
-                    icon = { painterResource("delete.svg") },
+                    icon = { painterResource(AppIcons.DELETE) },
                    onClick = onDeleteBranch
                )
            )
@ -71,7 +72,7 @@ fun branchContextMenuItems(
            add(
                ContextMenuElement.ContextTextEntry(
                    label = "Delete remote branch",
-                    icon = { painterResource("delete.svg") },
+                    icon = { painterResource(AppIcons.DELETE) },
                    onClick = onDeleteRemoteBranch
                ),
            )
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/CommitedChangesEntriesContextMenu.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/CommitedChangesEntriesContextMenu.kt
@ -2,6 +2,7 @@ package com.jetpackduba.gitnuro.ui.context_menu

 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.ui.res.painterResource
+import com.jetpackduba.gitnuro.AppIcons
 import org.eclipse.jgit.diff.DiffEntry

@OptIn(ExperimentalFoundationApi::class)
@ -17,14 +18,14 @@ fun commitedChangesEntriesContextMenuItems(
            add(
                ContextMenuElement.ContextTextEntry(
                    label = "Blame file",
-                    icon = { painterResource("blame.svg") },
+                    icon = { painterResource(AppIcons.BLAME) },
                    onClick = onBlame,
                )
            )
            add(
                ContextMenuElement.ContextTextEntry(
                    label = "File history",
-                    icon = { painterResource("history.svg") },
+                    icon = { painterResource(AppIcons.HISTORY) },
                    onClick = onHistory,
                )
            )
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/LogContextMenu.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/LogContextMenu.kt
@ -1,6 +1,7 @@
 package com.jetpackduba.gitnuro.ui.context_menu

 import androidx.compose.ui.res.painterResource
+import com.jetpackduba.gitnuro.AppIcons

 fun logContextMenu(
    onCheckoutCommit: () -> Unit,
@ -13,17 +14,17 @@ fun logContextMenu(
 ) = listOf(
    ContextMenuElement.ContextTextEntry(
        label = "Checkout commit",
-        icon = { painterResource("start.svg") },
+        icon = { painterResource(AppIcons.START) },
        onClick = onCheckoutCommit
    ),
    ContextMenuElement.ContextTextEntry(
        label = "Create branch",
-        icon = { painterResource("branch.svg") },
+        icon = { painterResource(AppIcons.BRANCH) },
        onClick = onCreateNewBranch
    ),
    ContextMenuElement.ContextTextEntry(
        label = "Create tag",
-        icon = { painterResource("tag.svg") },
+        icon = { painterResource(AppIcons.TAG) },
        onClick = onCreateNewTag
    ),
    ContextMenuElement.ContextSeparator,
@ -33,7 +34,7 @@ fun logContextMenu(
    ),
    ContextMenuElement.ContextTextEntry(
        label = "Revert commit",
-        icon = { painterResource("revert.svg") },
+        icon = { painterResource(AppIcons.REVERT) },
        onClick = onRevertCommit
    ),
    ContextMenuElement.ContextTextEntry(
@ -42,7 +43,7 @@ fun logContextMenu(
    ),
    ContextMenuElement.ContextTextEntry(
        label = "Reset current branch to this commit",
-        icon = { painterResource("undo.svg") },
+        icon = { painterResource(AppIcons.UNDO) },
        onClick = onResetBranch
    ),
 )
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/RemoteBranchesContextMenu.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/RemoteBranchesContextMenu.kt
@ -4,6 +4,7 @@ package com.jetpackduba.gitnuro.ui.context_menu

 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.ui.res.painterResource
+import com.jetpackduba.gitnuro.AppIcons

 fun remoteBranchesContextMenu(
    onDeleteBranch: () -> Unit
@ -11,7 +12,7 @@ fun remoteBranchesContextMenu(
    return listOf(
        ContextMenuElement.ContextTextEntry(
            label = "Delete remote branch",
-            icon = { painterResource("delete.svg") },
+            icon = { painterResource(AppIcons.DELETE) },
            onClick = onDeleteBranch
        ),
    )
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/RepositoryAdditionalOptionsMenu.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/RepositoryAdditionalOptionsMenu.kt
@ -1,6 +1,7 @@
 package com.jetpackduba.gitnuro.ui.context_menu

 import androidx.compose.foundation.ExperimentalFoundationApi
+import com.jetpackduba.gitnuro.AppIcons

@OptIn(ExperimentalFoundationApi::class)
 fun repositoryAdditionalOptionsMenu(
@ -9,7 +10,7 @@ fun repositoryAdditionalOptionsMenu(
    return mutableListOf(
        DropDownContentData(
            label = "Open repository folder",
-            icon = "source.svg",
+            icon = AppIcons.SOURCE,
            onClick = onOpenRepositoryOnFileExplorer,
        ),
    )
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/StashesContextMenu.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/StashesContextMenu.kt
@ -1,6 +1,7 @@
 package com.jetpackduba.gitnuro.ui.context_menu

 import androidx.compose.ui.res.painterResource
+import com.jetpackduba.gitnuro.AppIcons

 fun stashesContextMenuItems(
    onApply: () -> Unit,
@ -10,17 +11,17 @@ fun stashesContextMenuItems(
    return listOf(
        ContextMenuElement.ContextTextEntry(
            label = "Apply stash",
-            icon = { painterResource("apply_stash.svg") },
+            icon = { painterResource(AppIcons.APPLY_STASH) },
            onClick = onApply
        ),
        ContextMenuElement.ContextTextEntry(
            label = "Pop stash",
-            icon = { painterResource("apply_stash.svg") },
+            icon = { painterResource(AppIcons.APPLY_STASH) },
            onClick = onPop
        ),
        ContextMenuElement.ContextTextEntry(
            label = "Drop stash",
-            icon = { painterResource("delete.svg") },
+            icon = { painterResource(AppIcons.DELETE) },
            onClick = onDelete
        ),
    )
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/StatusEntriesContextMenu.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/StatusEntriesContextMenu.kt
@ -1,6 +1,7 @@
 package com.jetpackduba.gitnuro.ui.context_menu

 import androidx.compose.ui.res.painterResource
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.git.workspace.StatusEntry
 import com.jetpackduba.gitnuro.git.workspace.StatusType

@ -17,7 +18,7 @@ fun statusEntriesContextMenuItems(
            add(
                ContextMenuElement.ContextTextEntry(
                    label = "Discard file changes",
-                    icon = { painterResource("undo.svg") },
+                    icon = { painterResource(AppIcons.UNDO) },
                    onClick = onReset,
                )
            )
@ -26,7 +27,7 @@ fun statusEntriesContextMenuItems(
                add(
                    ContextMenuElement.ContextTextEntry(
                        label = "Blame file",
-                        icon = { painterResource("blame.svg") },
+                        icon = { painterResource(AppIcons.BLAME) },
                        onClick = onBlame,
                    )
                )
@ -34,7 +35,7 @@ fun statusEntriesContextMenuItems(
                add(
                    ContextMenuElement.ContextTextEntry(
                        label = "File history",
-                        icon = { painterResource("history.svg") },
+                        icon = { painterResource(AppIcons.HISTORY) },
                        onClick = onHistory,
                    )
                )
@ -48,7 +49,7 @@ fun statusEntriesContextMenuItems(
            add(
                ContextMenuElement.ContextTextEntry(
                    label = "Delete file",
-                    icon = { painterResource("delete.svg") },
+                    icon = { painterResource(AppIcons.DELETE) },
                    onClick = onDelete,
                )
            )
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/TagContextMenu.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/TagContextMenu.kt
@ -1,6 +1,7 @@
 package com.jetpackduba.gitnuro.ui.context_menu

 import androidx.compose.ui.res.painterResource
+import com.jetpackduba.gitnuro.AppIcons

 fun tagContextMenuItems(
    onCheckoutTag: () -> Unit,
@ -9,12 +10,12 @@ fun tagContextMenuItems(
    return mutableListOf(
        ContextMenuElement.ContextTextEntry(
            label = "Checkout tag",
-            icon = { painterResource("start.svg") },
+            icon = { painterResource(AppIcons.START) },
            onClick = onCheckoutTag
        ),
        ContextMenuElement.ContextTextEntry(
            label = "Delete tag",
-            icon = { painterResource("delete.svg") },
+            icon = { painterResource(AppIcons.DELETE) },
            onClick = onDeleteTag
        )
    )
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/AuthorDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/AuthorDialog.kt
@ -13,6 +13,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.theme.outlinedTextFieldColors
 import com.jetpackduba.gitnuro.ui.components.AdjustableOutlinedTextField
 import com.jetpackduba.gitnuro.ui.components.PrimaryButton
@ -84,7 +85,7 @@ fun AuthorDialog(
                modifier = Modifier.alpha(visibilityAlpha)
            ) {
                Icon(
-                    painterResource("warning.svg"),
+                    painterResource(AppIcons.WARNING),
                    contentDescription = null,
                    tint = MaterialTheme.colors.onBackground,
                    modifier = Modifier.size(16.dp)
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/EditRemotesDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/EditRemotesDialog.kt
@ -16,6 +16,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.extensions.handMouseClickable
 import com.jetpackduba.gitnuro.extensions.handOnHover
 import com.jetpackduba.gitnuro.theme.backgroundSelected
@ -179,7 +180,7 @@ fun EditRemotesDialog(
                            }
                        ) {
                            Icon(
-                                painter = painterResource("add.svg"),
+                                painter = painterResource(AppIcons.ADD),
                                contentDescription = null,
                                tint = MaterialTheme.colors.onBackground,
                            )
@ -195,7 +196,7 @@ fun EditRemotesDialog(
                            }
                        ) {
                            Icon(
-                                painter = painterResource("remove.svg"),
+                                painter = painterResource(AppIcons.REMOVE),
                                contentDescription = null,
                                tint = if (selectedRemote != null)
                                    MaterialTheme.colors.onBackground
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/GpgPasswordDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/GpgPasswordDialog.kt
@ -1,6 +1,7 @@
 package com.jetpackduba.gitnuro.ui.dialogs

 import androidx.compose.runtime.Composable
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.credentials.CredentialsRequested

@Composable
@ -12,7 +13,7 @@ fun GpgPasswordDialog(
    PasswordDialog(
        title = "Introduce your GPG key's password",
        subtitle = "Your GPG key is protected with a password",
-        icon = "key.svg",
+        icon = AppIcons.KEY,
        cancelButtonText = "Do not sign",
        isRetry = gpgCredentialsRequested.isRetry,
        password = gpgCredentialsRequested.password,
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewBranchDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewBranchDialog.kt
@ -15,6 +15,7 @@ import androidx.compose.ui.input.key.onPreviewKeyEvent
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.keybindings.KeybindingOption
 import com.jetpackduba.gitnuro.keybindings.matchesBinding
 import com.jetpackduba.gitnuro.theme.onBackgroundSecondary
@ -36,7 +37,7 @@ fun NewBranchDialog(
            verticalArrangement = Arrangement.Center,
        ) {
            Icon(
-                painterResource("branch.svg"),
+                painterResource(AppIcons.BRANCH),
                contentDescription = null,
                modifier = Modifier
                    .size(64.dp)
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt
@ -15,6 +15,7 @@ import androidx.compose.ui.input.key.onPreviewKeyEvent
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.keybindings.KeybindingOption
 import com.jetpackduba.gitnuro.keybindings.matchesBinding
 import com.jetpackduba.gitnuro.theme.onBackgroundSecondary
@ -36,7 +37,7 @@ fun NewTagDialog(
            verticalArrangement = Arrangement.Center,
        ) {
            Icon(
-                painterResource("tag.svg"),
+                painterResource(AppIcons.TAG),
                contentDescription = null,
                modifier = Modifier
                    .size(64.dp)
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/PasswordDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/PasswordDialog.kt
@ -22,6 +22,7 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.extensions.handOnHover
 import com.jetpackduba.gitnuro.keybindings.KeybindingOption
 import com.jetpackduba.gitnuro.keybindings.matchesBinding
@ -106,9 +107,9 @@ fun PasswordDialog(
                visualTransformation = if (showPassword) VisualTransformation.None else PasswordVisualTransformation(),
                trailingIcon = {
                    val visibilityIcon = if (showPassword) {
-                        "visibility_off.svg"
+                        AppIcons.VISIBILITY_OFF
                    } else {
-                        "visibility.svg"
+                        AppIcons.VISIBILITY
                    }

                    IconButton(
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/QuickActionsDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/QuickActionsDialog.kt
@ -16,6 +16,7 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.input.key.onKeyEvent
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.extensions.backgroundIf
 import com.jetpackduba.gitnuro.extensions.handMouseClickable
 import com.jetpackduba.gitnuro.keybindings.KeybindingOption
@ -32,9 +33,9 @@ fun QuickActionsDialog(
    val textFieldFocusRequester = remember { FocusRequester() }
    val items = remember {
        listOf(
-            QuickAction("code.svg", "Open repository in file manager", QuickActionType.OPEN_DIR_IN_FILE_MANAGER),
-            QuickAction("download.svg", "Clone new repository", QuickActionType.CLONE),
-            QuickAction("refresh.svg", "Refresh repository data", QuickActionType.REFRESH),
+            QuickAction(AppIcons.CODE, "Open repository in file manager", QuickActionType.OPEN_DIR_IN_FILE_MANAGER),
+            QuickAction(AppIcons.DOWNLOAD, "Clone new repository", QuickActionType.CLONE),
+            QuickAction(AppIcons.REFRESH, "Refresh repository data", QuickActionType.REFRESH),
        )
    }

--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt
@ -16,6 +16,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.git.log.ResetType
 import com.jetpackduba.gitnuro.theme.onBackgroundSecondary
 import com.jetpackduba.gitnuro.ui.components.PrimaryButton
@ -32,7 +33,7 @@ fun ResetBranchDialog(
            horizontalAlignment = Alignment.CenterHorizontally,
        ) {
            Icon(
-                painterResource("undo.svg"),
+                painterResource(AppIcons.UNDO),
                contentDescription = null,
                modifier = Modifier
                    .size(64.dp)
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/SshPasswordDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/SshPasswordDialog.kt
@ -1,6 +1,7 @@
 package com.jetpackduba.gitnuro.ui.dialogs

 import androidx.compose.runtime.Composable
+import com.jetpackduba.gitnuro.AppIcons

@Composable
 fun SshPasswordDialog(
@ -10,7 +11,7 @@ fun SshPasswordDialog(
    PasswordDialog(
        title = "Introduce your SSH key's password",
        subtitle = "Your SSH key is protected with a password",
-        icon = "lock.svg",
+        icon = AppIcons.LOCK,
        onReject = onReject,
        onAccept = onAccept,
    )
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/StashWithMessageDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/StashWithMessageDialog.kt
@ -15,6 +15,7 @@ import androidx.compose.ui.input.key.onPreviewKeyEvent
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.keybindings.KeybindingOption
 import com.jetpackduba.gitnuro.keybindings.matchesBinding
 import com.jetpackduba.gitnuro.theme.onBackgroundSecondary
@ -36,7 +37,7 @@ fun StashWithMessageDialog(
            verticalArrangement = Arrangement.Center,
        ) {
            Icon(
-                painterResource("stash.svg"),
+                painterResource(AppIcons.STASH),
                contentDescription = null,
                modifier = Modifier
                    .size(64.dp)
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/UserPasswordDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/UserPasswordDialog.kt
@ -16,6 +16,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.keybindings.KeybindingOption
 import com.jetpackduba.gitnuro.keybindings.matchesBinding
 import com.jetpackduba.gitnuro.theme.onBackgroundSecondary
@ -43,7 +44,7 @@ fun UserPasswordDialog(
            verticalArrangement = Arrangement.Center,
        ) {
            Icon(
-                painterResource("lock.svg"),
+                painterResource(AppIcons.LOCK),
                contentDescription = null,
                modifier = Modifier
                    .size(64.dp)
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/settings/SettingsDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/settings/SettingsDialog.kt
@ -12,6 +12,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.extensions.handMouseClickable
 import com.jetpackduba.gitnuro.preferences.DEFAULT_UI_SCALE
 import com.jetpackduba.gitnuro.theme.*
@ -280,7 +281,7 @@ fun <T : DropDownOption> SettingDropDown(
                )

                Icon(
-                    painter = painterResource("dropdown.svg"),
+                    painter = painterResource(AppIcons.DROPDOWN),
                    contentDescription = null,
                    tint = MaterialTheme.colors.onBackground,
                )
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt
@ -31,6 +31,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.extensions.*
 import com.jetpackduba.gitnuro.git.DiffEntryType
 import com.jetpackduba.gitnuro.git.EntryContent
@ -314,7 +315,7 @@ private fun AnimatedImage(imagePath: String) {
@Composable
 fun BinaryDiff() {
    Image(
-        painter = painterResource("binary.svg"),
+        painter = painterResource(AppIcons.BINARY),
        contentDescription = null,
        modifier = Modifier.width(400.dp),
        colorFilter = ColorFilter.tint(MaterialTheme.colors.primary)
@ -704,7 +705,7 @@ private fun DiffHeader(
                    .handOnHover()
            ) {
                Image(
-                    painter = painterResource("close.svg"),
+                    painter = painterResource(AppIcons.CLOSE),
                    contentDescription = "Close diff",
                    colorFilter = ColorFilter.tint(MaterialTheme.colors.onBackground),
                )
@ -810,7 +811,7 @@ private fun PathOnlyDiffHeader(
                .handOnHover()
        ) {
            Image(
-                painter = painterResource("close.svg"),
+                painter = painterResource(AppIcons.CLOSE),
                contentDescription = "Close diff",
                colorFilter = ColorFilter.tint(MaterialTheme.colors.onBackground),
            )
@ -908,9 +909,9 @@ fun DiffLineText(line: Line, diffEntryType: DiffEntryType, onActionTriggered: ()

            val iconName = remember(diffEntryType) {
                if (diffEntryType is DiffEntryType.StagedDiff) {
-                    "remove.svg"
+                    AppIcons.REMOVE
                } else {
-                    "add.svg"
+                    AppIcons.ADD
                }
            }

--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt
@ -37,6 +37,7 @@ import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import com.jetpackduba.gitnuro.AppIcons
 import com.jetpackduba.gitnuro.extensions.*
 import com.jetpackduba.gitnuro.git.graph.GraphCommitList
 import com.jetpackduba.gitnuro.git.graph.GraphNode
@ -239,7 +240,7 @@ fun Log(
                    ) {
                        Row(verticalAlignment = Alignment.CenterVertically) {
                            Icon(
-                                painterResource("align_top.svg"),
+                                painterResource(AppIcons.ALIGN_TOP),
                                contentDescription = null,
                                tint = MaterialTheme.colors.onPrimary,
                                modifier = Modifier.size(20.dp),
@ -1110,7 +1111,7 @@ fun BranchChip(
    if (isCurrentBranch) {
        endingContent = {
            Icon(
-                painter = painterResource("location.svg"),
+                painter = painterResource(AppIcons.LOCATION),
                contentDescription = null,
                modifier = Modifier.padding(end = 6.dp),
                tint = MaterialTheme.colors.primaryVariant,
@ -1122,7 +1123,7 @@ fun BranchChip(
        modifier = modifier,
        color = color,
        ref = ref,
-        icon = "branch.svg",
+        icon = AppIcons.BRANCH,
        onCheckoutRef = onCheckoutBranch,
        contextMenuItemsList = contextMenuItemsList,
        endingContent = endingContent,
@ -1148,7 +1149,7 @@ fun TagChip(
    RefChip(
        modifier,
        ref,
-        "tag.svg",
+        AppIcons.TAG,
        onCheckoutRef = onCheckoutTag,
        contextMenuItemsList = contextMenuItemsList,
        color = color,