Prefer ImageVector for Compose#146
Merged
Merged
Conversation
18620b5 to
6a416a6
Compare
There was a problem hiding this comment.
Pull request overview
This PR migrates the app’s Compose UI away from painterResource(R.drawable.*) vector drawables toward in-code ImageVector icons, centralizing them under MihomoIcons and updating screens/components to accept ImageVector parameters.
Changes:
- Added
MihomoIconsplus a large set ofImageVectoricon definitions (baseline/outline + app logo) and removed the correspondingres/drawable/*.xmlvectors. - Updated Compose UI components/screens to take
ImageVector(orImageVector?) instead of@DrawableResIDs and to useIcon(imageVector = ...). - Updated launcher adaptive-icon resources to reference a mipmap foreground vector.
Reviewed changes
Copilot reviewed 118 out of 119 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| common/src/main/kotlin/com/github/kr328/clash/common/compat/Context.kt | Removes getDrawableCompat() helper (no longer needed after ImageVector migration). |
| app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | Switches adaptive icon foreground/monochrome to @mipmap/ic_launcher_foreground. |
| app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml | Switches adaptive icon round foreground/monochrome to @mipmap/ic_launcher_foreground. |
| app/src/main/res/mipmap-anydpi-v26/ic_launcher_foreground.xml | Adds mipmap vector foreground asset used by adaptive icons. |
| app/src/main/res/drawable/ic_outline_update.xml | Removes old vector drawable (replaced by MihomoIcons.OutlineUpdate). |
| app/src/main/res/drawable/ic_outline_not_interested.xml | Removes old vector drawable (replaced by MihomoIcons.OutlineNotInterested). |
| app/src/main/res/drawable/ic_outline_label.xml | Removes old vector drawable (replaced by MihomoIcons.OutlineLabel). |
| app/src/main/res/drawable/ic_outline_info.xml | Removes old vector drawable (replaced by MihomoIcons.OutlineInfo). |
| app/src/main/res/drawable/ic_outline_inbox.xml | Removes old vector drawable (replaced by MihomoIcons.OutlineInbox). |
| app/src/main/res/drawable/ic_outline_folder.xml | Removes old vector drawable (replaced by MihomoIcons.OutlineFolder). |
| app/src/main/res/drawable/ic_outline_delete.xml | Removes old vector drawable (replaced by MihomoIcons.OutlineDelete). |
| app/src/main/res/drawable/ic_outline_check_circle.xml | Removes old vector drawable (replaced by MihomoIcons.OutlineCheckCircle). |
| app/src/main/res/drawable/ic_outline_article.xml | Removes old vector drawable (replaced by MihomoIcons.OutlineArticle). |
| app/src/main/res/drawable/ic_clash.xml | Removes old vector drawable (replaced by MihomoIcons.Clash). |
| app/src/main/res/drawable/ic_baseline_vpn_lock.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineVpnLock). |
| app/src/main/res/drawable/ic_baseline_view_list.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineViewList). |
| app/src/main/res/drawable/ic_baseline_update.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineUpdate). |
| app/src/main/res/drawable/ic_baseline_sync.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineSync). |
| app/src/main/res/drawable/ic_baseline_swap_vertical_circle.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineSwapVerticalCircle). |
| app/src/main/res/drawable/ic_baseline_swap_vert.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineSwapVert). |
| app/src/main/res/drawable/ic_baseline_stop.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineStop). |
| app/src/main/res/drawable/ic_baseline_stack.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineStack). |
| app/src/main/res/drawable/ic_baseline_settings.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineSettings). |
| app/src/main/res/drawable/ic_baseline_search.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineSearch). |
| app/src/main/res/drawable/ic_baseline_save.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineSave). |
| app/src/main/res/drawable/ic_baseline_restore.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineRestore). |
| app/src/main/res/drawable/ic_baseline_replay.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineReplay). |
| app/src/main/res/drawable/ic_baseline_qr_code_scanner.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineQrCodeScanner). |
| app/src/main/res/drawable/ic_baseline_publish.xml | Removes old vector drawable (replaced by MihomoIcons.BaselinePublish). |
| app/src/main/res/drawable/ic_baseline_more_vert.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineMoreVert). |
| app/src/main/res/drawable/ic_baseline_meta.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineMeta). |
| app/src/main/res/drawable/ic_baseline_info.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineInfo). |
| app/src/main/res/drawable/ic_baseline_hide.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineHide). |
| app/src/main/res/drawable/ic_baseline_help_center.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineHelpCenter). |
| app/src/main/res/drawable/ic_baseline_get_app.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineGetApp). |
| app/src/main/res/drawable/ic_baseline_flash_on.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineFlashOn). |
| app/src/main/res/drawable/ic_baseline_extension.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineExtension). |
| app/src/main/res/drawable/ic_baseline_edit.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineEdit). |
| app/src/main/res/drawable/ic_baseline_domain.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineDomain). |
| app/src/main/res/drawable/ic_baseline_dns.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineDns). |
| app/src/main/res/drawable/ic_baseline_delete.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineDelete). |
| app/src/main/res/drawable/ic_baseline_content_copy.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineContentCopy). |
| app/src/main/res/drawable/ic_baseline_cloud_download.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineCloudDownload). |
| app/src/main/res/drawable/ic_baseline_clear_all.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineClearAll). |
| app/src/main/res/drawable/ic_baseline_brightness_4.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineBrightness4). |
| app/src/main/res/drawable/ic_baseline_attach_file.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineAttachFile). |
| app/src/main/res/drawable/ic_baseline_assignment.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineAssignment). |
| app/src/main/res/drawable/ic_baseline_arrow_back.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineArrowBack). |
| app/src/main/res/drawable/ic_baseline_apps.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineApps). |
| app/src/main/res/drawable/ic_baseline_add.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineAdd). |
| app/src/main/res/drawable/ic_baseline_adb.xml | Removes old vector drawable (replaced by MihomoIcons.BaselineAdb). |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/MihomoIcons.kt | Introduces MihomoIcons namespace object for ImageVector extensions. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/Clash.kt | Adds ImageVector version of the app logo. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/OutlineUpdate.kt | Adds MihomoIcons.OutlineUpdate ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/OutlineNotInterested.kt | Adds MihomoIcons.OutlineNotInterested ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/OutlineLabel.kt | Adds MihomoIcons.OutlineLabel ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/OutlineInfo.kt | Adds MihomoIcons.OutlineInfo ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/OutlineInbox.kt | Adds MihomoIcons.OutlineInbox ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/OutlineFolder.kt | Adds MihomoIcons.OutlineFolder ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/OutlineDelete.kt | Adds MihomoIcons.OutlineDelete ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/OutlineCheckCircle.kt | Adds MihomoIcons.OutlineCheckCircle ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/OutlineArticle.kt | Adds MihomoIcons.OutlineArticle ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineVpnLock.kt | Adds MihomoIcons.BaselineVpnLock ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineViewList.kt | Adds MihomoIcons.BaselineViewList ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineUpdate.kt | Adds MihomoIcons.BaselineUpdate ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineSync.kt | Adds MihomoIcons.BaselineSync ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineSwapVerticalCircle.kt | Adds MihomoIcons.BaselineSwapVerticalCircle ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineSwapVert.kt | Adds MihomoIcons.BaselineSwapVert ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineStop.kt | Adds MihomoIcons.BaselineStop ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineStack.kt | Adds MihomoIcons.BaselineStack ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineSettings.kt | Adds MihomoIcons.BaselineSettings ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineSearch.kt | Adds MihomoIcons.BaselineSearch ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineSave.kt | Adds MihomoIcons.BaselineSave ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineRestore.kt | Adds MihomoIcons.BaselineRestore ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineReplay.kt | Adds MihomoIcons.BaselineReplay ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineQrCodeScanner.kt | Adds MihomoIcons.BaselineQrCodeScanner ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselinePublish.kt | Adds MihomoIcons.BaselinePublish ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineMoreVert.kt | Adds MihomoIcons.BaselineMoreVert ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineMeta.kt | Adds MihomoIcons.BaselineMeta ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineInfo.kt | Adds MihomoIcons.BaselineInfo ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineHide.kt | Adds MihomoIcons.BaselineHide ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineHelpCenter.kt | Adds MihomoIcons.BaselineHelpCenter ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineGetApp.kt | Adds MihomoIcons.BaselineGetApp ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineFlashOn.kt | Adds MihomoIcons.BaselineFlashOn ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineExtension.kt | Adds MihomoIcons.BaselineExtension ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineEdit.kt | Adds MihomoIcons.BaselineEdit ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineDomain.kt | Adds MihomoIcons.BaselineDomain ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineDns.kt | Adds MihomoIcons.BaselineDns ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineDelete.kt | Adds MihomoIcons.BaselineDelete ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineContentCopy.kt | Adds MihomoIcons.BaselineContentCopy ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineCloudDownload.kt | Adds MihomoIcons.BaselineCloudDownload ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineClearAll.kt | Adds MihomoIcons.BaselineClearAll ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineBrightness4.kt | Adds MihomoIcons.BaselineBrightness4 ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineAttachFile.kt | Adds MihomoIcons.BaselineAttachFile ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineAssignment.kt | Adds MihomoIcons.BaselineAssignment ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineArrowBack.kt | Adds MihomoIcons.BaselineArrowBack ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineApps.kt | Adds MihomoIcons.BaselineApps ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineAdd.kt | Adds MihomoIcons.BaselineAdd ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/icon/BaselineAdb.kt | Adds MihomoIcons.BaselineAdb ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/ui/component/SettingsPreferenceItem.kt | Updates settings preference items to accept ImageVector? icons. |
| app/src/main/kotlin/com/github/kr328/clash/ui/component/SettingsPreference.kt | Replaces delete/add icons with MihomoIcons.* ImageVectors. |
| app/src/main/kotlin/com/github/kr328/clash/ui/component/SettingsCommonScreen.kt | Uses Icon(imageVector=...) for tips icon. |
| app/src/main/kotlin/com/github/kr328/clash/ui/component/MihomoScaffold.kt | Uses MihomoIcons.BaselineArrowBack for navigation icon. |
| app/src/main/kotlin/com/github/kr328/clash/settings/ui/SettingsScreen.kt | Migrates settings entry icons to ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/settings/ui/OverrideSettingsScreen.kt | Migrates action/delete icons to MihomoIcons.*. |
| app/src/main/kotlin/com/github/kr328/clash/settings/ui/NetworkSettingsScreen.kt | Migrates VPN lock icon to MihomoIcons.BaselineVpnLock. |
| app/src/main/kotlin/com/github/kr328/clash/settings/ui/MetaFeatureSettingsScreen.kt | Migrates reset icon to MihomoIcons.BaselineReplay. |
| app/src/main/kotlin/com/github/kr328/clash/settings/ui/AppSettingsScreen.kt | Migrates multiple setting row icons to MihomoIcons.*. |
| app/src/main/kotlin/com/github/kr328/clash/settings/ui/AccessControlScreen.kt | Migrates search/menu icons to MihomoIcons.*. |
| app/src/main/kotlin/com/github/kr328/clash/proxy/ui/ProxyScreen.kt | Migrates delay-test/menu icons to MihomoIcons.*. |
| app/src/main/kotlin/com/github/kr328/clash/profile/ui/ProvidersScreen.kt | Migrates provider update/swap icons to MihomoIcons.*. |
| app/src/main/kotlin/com/github/kr328/clash/profile/ui/PropertiesScreen.kt | Migrates save + row icons to MihomoIcons.* and updates row API to ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/profile/ui/ProfilesScreen.kt | Migrates toolbar/menu icons to MihomoIcons.* and updates menu API to ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/profile/ui/NewProfileScreen.kt | Updates provider icon rendering to handle ImageVector (and external Drawable icons). |
| app/src/main/kotlin/com/github/kr328/clash/model/ProfileProvider.kt | Changes provider icons to use MihomoIcons.* ImageVectors and loosens icon type for External. |
| app/src/main/kotlin/com/github/kr328/clash/main/ui/MainScreen.kt | Migrates main screen logo and action icons to MihomoIcons.* and updates APIs to ImageVector. |
| app/src/main/kotlin/com/github/kr328/clash/log/ui/LogsScreen.kt | Migrates log actions/icons to MihomoIcons.* and updates API to ImageVector?. |
| app/src/main/kotlin/com/github/kr328/clash/log/ui/LogcatScreen.kt | Migrates stop/delete/export icons to MihomoIcons.*. |
| app/src/main/kotlin/com/github/kr328/clash/files/ui/FilesScreen.kt | Migrates file list/menu icons to MihomoIcons.* and updates menu API to ImageVector. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.