Skip to content

Fix no icon of settings view problem and new theme tab - #163

Closed
underthestars-zhy wants to merge 3 commits into
CodeEditApp:mainfrom
underthestars-zhy:main
Closed

underthestars-zhy wants to merge 3 commits into
CodeEditApp:mainfrom
underthestars-zhy:main

Conversation

@underthestars-zhy

@underthestars-zhy underthestars-zhy commented Mar 22, 2022 •

Copy link
Copy Markdown

Description

Setting view now shows icon. And also redesign the structure of settings.

Releated Issue

#146

Checklist (for drafts):

  • I read and understood the contributing guide as well as the code of conduct
  • My changes generate no new warnings
  • My code builds and runs on my machine
  • Review requested

Screenshots (if appropriate):

CleanShot 2022-03-22 at 19 50 02@2x

CleanShot 2022-03-22 at 21 12 24@2x

@underthestars-zhy underthestars-zhy changed the title Fix no icon of settings view problem Fix no icon of settings view problem and new theme tab Mar 22, 2022

@pkasila pkasila left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Implement theme selection in ThemeSettingsView (and then remove it from GeneralSettingsView, leave separate tab), use Color.accentColor

Comment on lines +20 to +37
VStack {
VStack {
themeItem.image
.resizable()
.frame(width: 116, height: 62)
.scaledToFit()
.border(Color(hexadecimal: "737373"), width: 1.5)
.cornerRadius(3)

Text(themeItem.name)
.font(.system(size: 12))
.multilineTextAlignment(.center)
}
.padding(5)
.background(BackGroundView(seelected: themeItem.selected(editorTheme)))
}
.frame(width: 120)
.padding()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In ThemeSettingsView, as I understand, there should be selection of themes, not just displaying of the current theme.

}

struct BackGroundView: View {
let seelected: Bool

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix typo: seelected to selected

var body: some View {
if seelected {
// Color(hexadecimal: "464546").cornerRadius(4)
Color(hexadecimal: "0158D0").cornerRadius(5)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use Color.accentColor

@underthestars-zhy

Copy link
Copy Markdown
Author

Because, they is a lot of changes. So I will delete this fork, and create new one

xinix909 pushed a commit to xinix909/CodeTransfer that referenced this pull request Sep 7, 2024
<!--- IMPORTANT: If this PR addresses multiple unrelated issues, it will
be closed until separated. -->

### Description

1. Add 20 pixels of inset to the left of the ruler and 8 pixels of inset
to the right of the ruler. I tried to match it as close as possible to
Xcode.
2. Set the background color of the highlight ruler line to the same
color as the highlighted line in the textView.

### Related Issues

<!--- REQUIRED: Tag all related issues (e.g. * CodeEditApp#123) -->
<!--- If this PR resolves the issue please specify (e.g. * closes CodeEditApp#123)
-->
<!--- If this PR addresses multiple issues, these issues must be related
to one other -->

* closes CodeEditApp#156
* closes CodeEditApp#128

### Checklist

<!--- Add things that are not yet implemented above -->

- [x] I read and understood the [contributing
guide](https://github.com/CodeEditApp/CodeEdit/blob/main/CONTRIBUTING.md)
as well as the [code of
conduct](https://github.com/CodeEditApp/CodeEdit/blob/main/CODE_OF_CONDUCT.md)
- [x] The issues this PR addresses are related to each other
- [x] My changes generate no new warnings
- [x] My code builds and runs on my machine
- [x] My changes are all related to the related issue above
- [x] I documented my code

### Screenshots

<!--- REQUIRED: if issue is UI related -->

<img width="765" alt="Screenshot 2023-03-16 at 19 05 59"
src="https://user-images.githubusercontent.com/82230675/225717006-40530a7b-7864-404b-8d14-5307f6f83bdb.png">


<!--- IMPORTANT: Fill out all required fields. Otherwise we might close
this PR temporarily -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants