Skip to content
This repository was archived by the owner on Jan 23, 2026. It is now read-only.

Commit ef31315

Browse files
author
fridakitten
committed
Aaa my legs hurt
1 parent 96c0f2c commit ef31315

File tree

9 files changed

+116
-19
lines changed

9 files changed

+116
-19
lines changed

‎Blueprint/FridaCodeManager.app/AppIcon.png‎

608 KB
Loading

‎FCM/UI/TabBar/FontSettings/FontBundleMain.swift‎

Lines changed: 46 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,18 @@ struct FontSettingsBundleMain: View {
2727
@AppStorage("fontname") var fname: String = "Menlo"
2828
@AppStorage("bsl") var bsl: Bool = true
2929
@AppStorage("fbold") var bold: Bool = false
30+
@AppStorage("defbakcolor") var dbc: Bool = true
31+
@AppStorage("deftextcolor") var dtc: Bool = true
3032

3133
//color
32-
@State private var color1: Color = Color.red
33-
@State private var color2: Color = Color.red
34-
@State private var color3: Color = Color.red
35-
@State private var color4: Color = Color.red
36-
@State private var color5: Color = Color.red
37-
@State private var color6: Color = Color.red
34+
@State private var color1: Color = Color.black
35+
@State private var color2: Color = Color.black
36+
@State private var color3: Color = Color.black
37+
@State private var color4: Color = Color.black
38+
@State private var color5: Color = Color.black
39+
@State private var color6: Color = Color.black
40+
@State private var color7: Color = Color.black
41+
@State private var color8: Color = Color.black
3842

3943
@State var font: CGFloat = 0.0
4044

@@ -53,6 +57,13 @@ struct ContentView: View {
5357
List {
5458
CodeEditorPreview(text: $code, font: $font, suffix: "swift")
5559
.frame(height: 120)
60+
.listRowBackground(dbc ? Color(UIColor.systemBackground) : color7
61+
//if !dbc {
62+
// color7
63+
//} else {
64+
// Color(UIColor.systemGray6)
65+
//}
66+
)
5667
.id(identifier)
5768
Section("Color") {
5869
HStack {
@@ -87,6 +98,28 @@ struct ContentView: View {
8798
identifier = UUID()
8899
}
89100
}
101+
Toggle("Default Background Color", isOn: $dbc)
102+
.onChange(of: bsl) { _ in
103+
identifier = UUID()
104+
}
105+
Toggle("Default Text Color", isOn: $dtc)
106+
.onChange(of: bsl) { _ in
107+
identifier = UUID()
108+
}
109+
if !dbc {
110+
ColorPicker("Background", selection: $color7)
111+
.onChange(of: color7) { _ in
112+
saveallcolor()
113+
identifier = UUID()
114+
}
115+
}
116+
if !dtc {
117+
ColorPicker("Text", selection: $color8)
118+
.onChange(of: color8) { _ in
119+
saveallcolor()
120+
identifier = UUID()
121+
}
122+
}
90123
Toggle("Text Seperation Layer", isOn: $bsl)
91124
.onChange(of: bsl) { _ in
92125
identifier = UUID()
@@ -108,7 +141,7 @@ struct ContentView: View {
108141
}
109142
}
110143
Section {
111-
NavigationLink(destination: LayoutST(font: $font, fontname: $fname, fontbold: $bold, fontbsl: $bsl, rc1: $color1, rc2: $color2, rc3: $color3, rc4: $color4, rc5: $color5, rc6: $color6)) {
144+
NavigationLink(destination: LayoutST(font: $font, fontname: $fname, fontbold: $bold, fontbsl: $bsl, dbc: $dbc, dtc: $dtc, rc1: $color1, rc2: $color2, rc3: $color3, rc4: $color4, rc5: $color5, rc6: $color6, rc7: $color7, rc8: $color8)) {
112145
Text("Layouts")
113146
}
114147
Button("Reset") {
@@ -119,11 +152,14 @@ struct ContentView: View {
119152
color4 = Color(UIColor(red: 0.7569, green: 0.2039, blue: 0.3882, alpha: 1.0))
120153
color5 = Color(UIColor(red: 0, green: 0.4824, blue: 0.9098, alpha: 1.0))
121154
color6 = Color(UIColor(red: 1.0, green: 0.5, blue: 0.0, alpha: 1.0))
155+
color7 = Color.black
122156
saveallcolor()
123157
font = 13
124158
UserDefaults.standard.set(font, forKey: "savedfont")
125159
bsl = true
126160
bold = false
161+
dbc = true
162+
dtc = true
127163
fname = "Menlo"
128164
identifier = UUID()
129165
}
@@ -132,7 +168,7 @@ struct ContentView: View {
132168
.navigationTitle("Code Editor")
133169
.navigationBarTitleDisplayMode(.inline)
134170
.onAppear {
135-
(color1, color2, color3, color4, color5, color6) = (loadColor("C1"), loadColor("C2"), loadColor("C3"), loadColor("C4"), loadColor("C5"), loadColor("C6"))
171+
(color1, color2, color3, color4, color5, color6, color7, color8) = (loadColor("C1"), loadColor("C2"), loadColor("C3"), loadColor("C4"), loadColor("C5"), loadColor("C6"), loadColor("C7"), loadColor("C8"))
136172
font = {
137173
if let savedFont = UserDefaults.standard.value(forKey: "savedfont") as? CGFloat {
138174
return savedFont
@@ -149,5 +185,7 @@ struct ContentView: View {
149185
saveColor("C4", color4)
150186
saveColor("C5", color5)
151187
saveColor("C6", color6)
188+
saveColor("C7", color7)
189+
saveColor("C8", color8)
152190
}
153191
}

‎FCM/UI/TabBar/FontSettings/Layout.swift‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,17 @@ struct Layout: Codable, Identifiable, Equatable {
1515
var fontname: String?
1616
var fontbold: Bool?
1717
var fontbsl: Bool?
18+
var dbc: Bool?
19+
var dtc: Bool?
1820
// -> color
1921
var c1: String?
2022
var c2: String?
2123
var c3: String?
2224
var c4: String?
2325
var c5: String?
2426
var c6: String?
27+
var c7: String?
28+
var c8: String?
2529
}
2630

2731
struct LayoutST: View {
@@ -31,12 +35,16 @@ struct LayoutST: View {
3135
@Binding var fontname: String
3236
@Binding var fontbold: Bool
3337
@Binding var fontbsl: Bool
38+
@Binding var dbc: Bool
39+
@Binding var dtc: Bool
3440
@State var c1: String = ""
3541
@State var c2: String = ""
3642
@State var c3: String = ""
3743
@State var c4: String = ""
3844
@State var c5: String = ""
3945
@State var c6: String = ""
46+
@State var c7: String = ""
47+
@State var c8: String = ""
4048

4149
//necessary
4250
@AppStorage("layoutName") var layoutName: String = ""
@@ -49,6 +57,8 @@ struct LayoutST: View {
4957
@Binding var rc4: Color
5058
@Binding var rc5: Color
5159
@Binding var rc6: Color
60+
@Binding var rc7: Color
61+
@Binding var rc8: Color
5262
var body: some View {
5363
ZStack {
5464
VStack {
@@ -100,6 +110,8 @@ struct LayoutST: View {
100110
c4 = colorToRGBString(rc4)
101111
c5 = colorToRGBString(rc5)
102112
c6 = colorToRGBString(rc6)
113+
c7 = colorToRGBString(rc7)
114+
c8 = colorToRGBString(rc8)
103115
}
104116
}
105117
}
@@ -126,12 +138,16 @@ struct LayoutST: View {
126138
fontname: fontname,
127139
fontbold: fontbold,
128140
fontbsl: fontbsl,
141+
dbc: dbc,
142+
dtc: dtc,
129143
c1: c1,
130144
c2: c2,
131145
c3: c3,
132146
c4: c4,
133147
c5: c5,
134-
c6: c6
148+
c6: c6,
149+
c7: c7,
150+
c8: c8
135151
)
136152
if let layoutData = try? JSONEncoder().encode(layout) {
137153
savedLayouts[layoutName] = try? JSONDecoder().decode(Layout.self, from: layoutData)
@@ -174,20 +190,26 @@ struct LayoutST: View {
174190
fontname = layout.fontname ?? "Menlo"
175191
fontbold = layout.fontbold ?? false
176192
fontbsl = layout.fontbsl ?? false
193+
dbc = layout.dbc ?? true
194+
dtc = layout.dtc ?? true
177195
// -> load color strings
178196
c1 = layout.c1 ?? ""
179197
c2 = layout.c2 ?? ""
180198
c3 = layout.c3 ?? ""
181199
c4 = layout.c4 ?? ""
182200
c5 = layout.c5 ?? ""
183201
c6 = layout.c6 ?? ""
202+
c7 = layout.c7 ?? ""
203+
c8 = layout.c8 ?? ""
184204
// -> store color strings into app storage
185205
saveColor("C1", RGBStringToColor(c1))
186206
saveColor("C2", RGBStringToColor(c2))
187207
saveColor("C3", RGBStringToColor(c3))
188208
saveColor("C4", RGBStringToColor(c4))
189209
saveColor("C5", RGBStringToColor(c5))
190210
saveColor("C6", RGBStringToColor(c6))
211+
saveColor("C7", RGBStringToColor(c7))
212+
saveColor("C8", RGBStringToColor(c8))
191213
}
192214
private func deleteLayouts(at offsets: IndexSet) {
193215
let indicesToRemove = Array(offsets)

‎FCM/UI/TabBar/FontSettings/UICodePreview.swift‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ struct CodeEditorPreview: View {
2828
@AppStorage("fontname") var fname: String = "Menlo"
2929
@AppStorage("bsl") var bsl: Bool = true
3030
@AppStorage("fbold") var bold: Bool = false
31+
@AppStorage("defbakcolor") var dbc: Bool = true
32+
@AppStorage("deftextcolor") var dtc: Bool = true
33+
3134
@Binding var text: String
3235
@Binding var font: CGFloat
3336
@State var rules: [HighlightRule]
@@ -38,6 +41,13 @@ struct CodeEditorPreview: View {
3841
}
3942
var body: some View {
4043
ZStack {
44+
if dbc {
45+
Color(UIColor.systemBackground)
46+
.ignoresSafeArea()
47+
} else {
48+
loadColor("C7")
49+
.ignoresSafeArea()
50+
}
4151
HighlightedTextEditor(text: $text, highlightRules: rules)
4252
.introspect { editor in
4353
editor.textView.font = UIFont(name: "\(fname)\(bold ? "-Bold" : "")", size: font)

‎FCM/UI/TabBar/shared.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
let changelog: String = "v1.5.1 \"Features\" Update\n-added keyboard toolbar with necessary features that were missing in the past\n-readded copy feature to the log"
1+
let changelog: String = "v1.5.1 \"Features\" Update\n-added keyboard toolbar with necessary features that were missing in the past\n-readded copy feature to the log\n-added new icon\n-added more theming settings in Code Editor Settings"

‎FCM/UI/UIAboutView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ struct Frida: View {
3030
("AppInstaller iOS", "Compiling Genius", "https://github.com/AppInstalleriOSGH.png"),
3131
("Snoolie", "Helping Hand", "https://github.com/0xilis.png"),
3232
("HAHALOSAH", "Helping Hand", "https://github.com/HAHALOSAH.png"),
33-
("MudSplasher", "Icon Designer", "https://github.com/MudSplasher.png"),
33+
("Ayame Yumemi", "Icon Designer", "https://github.com/ayayame09.png"),
3434
("meighler", "Licensor", "https://github.com/meighler.png")
3535
]
3636

‎FCM/UI/UICodeEditor.swift‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ struct CodeEditorGreat: View {
2828
@AppStorage("fontname") var fname: String = "Menlo"
2929
@AppStorage("bsl") var bsl: Bool = true
3030
@AppStorage("fbold") var bold: Bool = true
31+
@AppStorage("defbakcolor") var dbc: Bool = true
32+
@AppStorage("deftextcolor") var dtc: Bool = true
33+
3134
@Binding var text: String
3235
@State var font: CGFloat
3336
@State var rules: [HighlightRule]
@@ -38,8 +41,13 @@ struct CodeEditorGreat: View {
3841
}
3942
var body: some View {
4043
ZStack {
41-
Color(UIColor.systemGray6)
42-
.ignoresSafeArea()
44+
if dbc {
45+
Color(UIColor.systemGray6)
46+
.ignoresSafeArea()
47+
} else {
48+
loadColor("C7")
49+
.ignoresSafeArea()
50+
}
4351
HighlightedTextEditor(text: $text, highlightRules: rules)
4452
.introspect { editor in
4553
editor.textView.font = UIFont(name: "\(fname)\(bold ? "-Bold" : "")", size: font)

‎FCM/UI/UIConsole.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ struct NeoLog: View {
7272
.joined(separator: "\n")
7373
copyToClipboard(text: cleanTextToCopy)
7474
}) {
75-
Label("Copy", systemImage: "clipboard")
75+
Label("Copy", systemImage: "doc.on.doc")
7676
}
7777
}
7878
.onAppear {

‎FCM/UI/UIRuleCase.swift‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,23 @@ import Foundation
3434
import UIKit
3535

3636
func grule(_ isaythis: String) -> [HighlightRule] {
37+
var rules: [HighlightRule] = []
38+
39+
@State var dtc: Bool = {
40+
if let dtcstored = UserDefaults.standard.value(forKey: "deftextcolor") as? Bool {
41+
return dtcstored
42+
} else {
43+
return true
44+
}
45+
}()
46+
47+
if !dtc {
48+
rules += [HighlightRule(pattern: try! NSRegularExpression(pattern: ".*", options: []), formattingRules: [
49+
TextFormattingRule(key: .foregroundColor, value: UIColor(loadColor("C8"))) ])]
50+
}
3751
switch(isaythis) {
3852
case "swift":
39-
return [
53+
rules += [
4054
HighlightRule(pattern: try! NSRegularExpression(pattern: "\\b(let|var|struct|some|import|private|class|nil|return|func|override)\\b", options: []), formattingRules: [
4155
TextFormattingRule(key: .foregroundColor, value: UIColor(loadColor("C1")))
4256
]), HighlightRule(pattern: try! NSRegularExpression(pattern: "(?<=\\b(let|var|struct|func|class)\\s)\\w+", options: []), formattingRules: [
@@ -55,8 +69,9 @@ func grule(_ isaythis: String) -> [HighlightRule] {
5569
TextFormattingRule(key: .foregroundColor, value: UIColor(loadColor("C6")))
5670
])
5771
]
72+
break
5873
case "c", "m", "cpp", "mm","h":
59-
return [
74+
rules += [
6075
HighlightRule(pattern: try! NSRegularExpression(pattern: "\\b(struct|class|enum|nil|return)\\b", options: []), formattingRules: [
6176
TextFormattingRule(key: .foregroundColor, value: UIColor(loadColor("C1")))
6277
]), HighlightRule(pattern: try! NSRegularExpression(pattern: "\\b\\w+(?=\\s*(\\(|\\{))", options: []), formattingRules: [
@@ -73,21 +88,25 @@ func grule(_ isaythis: String) -> [HighlightRule] {
7388
TextFormattingRule(key: .foregroundColor, value: UIColor(loadColor("C6")))
7489
])
7590
]
91+
break
7692
case "html", "plist", "xml", "api","entitlements":
77-
return [
93+
rules += [
7894
HighlightRule(pattern: try! NSRegularExpression(pattern: "<[^>]+>", options: []), formattingRules: [
7995
TextFormattingRule(key: .foregroundColor, value: UIColor(red: 0.8, green: 0.2, blue: 0.2, alpha: 1.0))
8096
]), HighlightRule(pattern: try! NSRegularExpression(pattern: "(?<!\\/\\/)(\"(.*?)\")", options: []), formattingRules: [
8197
TextFormattingRule(key: .foregroundColor, value: UIColor(red: 1.0, green: 0.5, blue: 0.0, alpha: 1.0))
8298
])
8399
]
100+
break
84101
case "sh":
85-
return [
102+
rules += [
86103
HighlightRule(pattern: try! NSRegularExpression(pattern: "(#.*[\\s\\S]*?)", options: []), formattingRules: [
87104
TextFormattingRule(key: .foregroundColor, value: UIColor(red: 0, green: 0.4824, blue: 0.9098, alpha: 1.0))
88105
])
89106
]
107+
break
90108
default:
91-
return []
109+
rules += []
92110
}
111+
return rules
93112
}

0 commit comments

Comments
 (0)