diff --git a/Easydict/App/Assets.xcassets/Colors/setting_add_minus_bg.colorset/Contents.json b/Easydict/App/Assets.xcassets/Colors/add_minus_bg_color.colorset/Contents.json similarity index 100% rename from Easydict/App/Assets.xcassets/Colors/setting_add_minus_bg.colorset/Contents.json rename to Easydict/App/Assets.xcassets/Colors/add_minus_bg_color.colorset/Contents.json diff --git a/Easydict/App/Assets.xcassets/Colors/setting_list_border.colorset/Contents.json b/Easydict/App/Assets.xcassets/Colors/list_border_color.colorset/Contents.json similarity index 100% rename from Easydict/App/Assets.xcassets/Colors/setting_list_border.colorset/Contents.json rename to Easydict/App/Assets.xcassets/Colors/list_border_color.colorset/Contents.json diff --git a/Easydict/App/Assets.xcassets/Colors/service_cell_highlight.colorset/Contents.json b/Easydict/App/Assets.xcassets/Colors/service_cell_highlight_color.colorset/Contents.json similarity index 100% rename from Easydict/App/Assets.xcassets/Colors/service_cell_highlight.colorset/Contents.json rename to Easydict/App/Assets.xcassets/Colors/service_cell_highlight_color.colorset/Contents.json diff --git a/Easydict/NewApp/View/SettingView/Tabs/DisabledAppTab.swift b/Easydict/NewApp/View/SettingView/Tabs/DisabledAppTab.swift index baa241c10..793b87d3b 100644 --- a/Easydict/NewApp/View/SettingView/Tabs/DisabledAppTab.swift +++ b/Easydict/NewApp/View/SettingView/Tabs/DisabledAppTab.swift @@ -106,7 +106,7 @@ struct DisabledAppTab: View { .clipShape(RoundedRectangle(cornerRadius: 8)) .overlay(content: { RoundedRectangle(cornerRadius: 8) - .stroke(Color("setting_list_border"), lineWidth: 0.5) + .stroke(Color("list_border_color"), lineWidth: 0.5) }) .padding(.bottom) .padding(.horizontal, 35) @@ -148,7 +148,7 @@ private struct ListToolbar: View { .padding(2) } .frame(height: 28) - .background(Color("setting_add_minus_bg")) + .background(Color("add_minus_bg_color")) } } @@ -164,9 +164,11 @@ private struct ListButton: View { Image(systemName: imageName) .resizable() .scaledToFit() - .frame(width: 12, height: 12) + .frame(width: 10, height: 10) .padding(6) .contentShape(Rectangle()) + .foregroundStyle(Color(.secondaryLabelColor)) + .font(.system(size: 14, weight: .semibold)) } .buttonStyle(BorderlessButtonStyle()) } diff --git a/Easydict/NewApp/View/SettingView/Tabs/ServiceTab.swift b/Easydict/NewApp/View/SettingView/Tabs/ServiceTab.swift index 5399f9af7..83a5f6398 100644 --- a/Easydict/NewApp/View/SettingView/Tabs/ServiceTab.swift +++ b/Easydict/NewApp/View/SettingView/Tabs/ServiceTab.swift @@ -172,7 +172,7 @@ private struct ServiceItemView: View { .listRowSeparator(.hidden) .listRowInsets(.init()) .padding(10) - .listRowBackground(viewModel.selectedService == service ? Color("service_cell_highlight") : tableColor) + .listRowBackground(viewModel.selectedService == service ? Color("service_cell_highlight_color") : tableColor) .overlay { TapHandler { viewModel.selectedService = service