mirror of
https://github.com/StikDebug/StikDebug.git
synced 2026-10-16 12:30:29 +00:00
Quality of life enhancements
This commit is contained in:
Stephen
parent
3aa9b4603e
commit
47dfbbed6c
11 changed files with 443 additions and 91 deletions
|
|
@ -10,6 +10,10 @@
|
|||
<string>allow-vpn</string>
|
||||
<key>com.apple.security.app-sandbox</key>
|
||||
<true/>
|
||||
<key>com.apple.security.application-groups</key>
|
||||
<array>
|
||||
<string>group.com.stik.sj</string>
|
||||
</array>
|
||||
<key>com.apple.security.files.user-selected.read-only</key>
|
||||
<true/>
|
||||
</dict>
|
||||
|
|
|
|||
|
|
@ -7,13 +7,25 @@
|
|||
|
||||
import SwiftUI
|
||||
import UIKit
|
||||
import WidgetKit
|
||||
|
||||
struct InstalledAppsListView: View {
|
||||
@StateObject private var viewModel = InstalledAppsViewModel()
|
||||
@State private var appIcons: [String: UIImage] = [:]
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
private let sharedDefaults = UserDefaults(suiteName: "group.com.stik.sj")!
|
||||
|
||||
@AppStorage("recentApps") private var recentApps: [String] = []
|
||||
@AppStorage("favoriteApps") private var favoriteApps: [String] = []
|
||||
@AppStorage("favoriteApps") private var favoriteApps: [String] = [] {
|
||||
didSet {
|
||||
if favoriteApps.count > 4 {
|
||||
favoriteApps = Array(favoriteApps.prefix(4))
|
||||
}
|
||||
sharedDefaults.set(favoriteApps, forKey: "favoriteApps")
|
||||
WidgetCenter.shared.reloadAllTimelines()
|
||||
}
|
||||
}
|
||||
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
var onSelectApp: (String) -> Void
|
||||
|
||||
var body: some View {
|
||||
|
|
@ -26,51 +38,37 @@ struct InstalledAppsListView: View {
|
|||
}
|
||||
}
|
||||
.navigationTitle("Installed Apps")
|
||||
.navigationBarItems(
|
||||
trailing: Button("Done") {
|
||||
dismiss()
|
||||
.toolbar {
|
||||
ToolbarItem(placement: .navigationBarTrailing) {
|
||||
Button("Done") { dismiss() }
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
.background(Color(UIColor.systemGroupedBackground).edgesIgnoringSafeArea(.all))
|
||||
}
|
||||
|
||||
// MARK: - Empty State
|
||||
|
||||
private var emptyState: some View {
|
||||
VStack(spacing: 16) {
|
||||
Image(systemName: "magnifyingglass")
|
||||
.resizable()
|
||||
.scaledToFit()
|
||||
.frame(width: 60, height: 60)
|
||||
.foregroundColor(.gray)
|
||||
|
||||
.resizable().scaledToFit().frame(width: 60, height: 60).foregroundColor(.gray)
|
||||
Text("No Debuggable App Found")
|
||||
.font(.title2)
|
||||
.fontWeight(.semibold)
|
||||
.foregroundColor(.primary)
|
||||
|
||||
.font(.title2).fontWeight(.semibold).foregroundColor(.primary)
|
||||
Text("""
|
||||
StikDebug can only connect to apps with the "**get-task-allow**" entitlement. \
|
||||
Please check if the app you want to connect to is signed with a **development** certificate.
|
||||
""")
|
||||
.font(.body)
|
||||
.foregroundColor(.secondary)
|
||||
.multilineTextAlignment(.center)
|
||||
.padding(.horizontal)
|
||||
.font(.body).foregroundColor(.secondary).multilineTextAlignment(.center).padding(.horizontal)
|
||||
}
|
||||
.padding()
|
||||
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
||||
.background(Color(.systemBackground))
|
||||
.padding().frame(maxWidth: .infinity, maxHeight: .infinity)
|
||||
.background(Color(UIColor.systemBackground))
|
||||
}
|
||||
|
||||
// MARK: - List of Apps
|
||||
|
||||
private var appsList: some View {
|
||||
List {
|
||||
// Favorites
|
||||
if !favoriteApps.isEmpty {
|
||||
Section(header: Text("Favorites")) {
|
||||
Section(header: Text("Favorites - (\(favoriteApps.count)/4)")) {
|
||||
ForEach(favoriteApps, id: \.self) { bundleID in
|
||||
AppButton(
|
||||
bundleID: bundleID,
|
||||
|
|
@ -78,13 +76,13 @@ Please check if the app you want to connect to is signed with a **development**
|
|||
recentApps: $recentApps,
|
||||
favoriteApps: $favoriteApps,
|
||||
appIcons: $appIcons,
|
||||
onSelectApp: onSelectApp
|
||||
onSelectApp: onSelectApp,
|
||||
sharedDefaults: sharedDefaults
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Recents
|
||||
if !recentApps.isEmpty {
|
||||
Section(header: Text("Recents")) {
|
||||
ForEach(recentApps, id: \.self) { bundleID in
|
||||
|
|
@ -94,12 +92,16 @@ Please check if the app you want to connect to is signed with a **development**
|
|||
recentApps: $recentApps,
|
||||
favoriteApps: $favoriteApps,
|
||||
appIcons: $appIcons,
|
||||
onSelectApp: onSelectApp
|
||||
onSelectApp: onSelectApp,
|
||||
sharedDefaults: sharedDefaults
|
||||
)
|
||||
.swipeActions(edge: .trailing) {
|
||||
Button(role: .destructive) {
|
||||
withAnimation {
|
||||
recentApps.removeAll(where: { $0 == bundleID })
|
||||
recentApps.removeAll { $0 == bundleID }
|
||||
sharedDefaults.set(recentApps, forKey: "recentApps")
|
||||
sharedDefaults.set(favoriteApps, forKey: "favoriteApps")
|
||||
WidgetCenter.shared.reloadAllTimelines()
|
||||
}
|
||||
} label: {
|
||||
Label("Delete", systemImage: "trash")
|
||||
|
|
@ -109,32 +111,17 @@ Please check if the app you want to connect to is signed with a **development**
|
|||
}
|
||||
}
|
||||
|
||||
// All Applications
|
||||
if favoriteApps.isEmpty && recentApps.isEmpty {
|
||||
Section {
|
||||
ForEach(viewModel.apps.sorted(by: { $0.key < $1.key }), id: \.key) { bundleID, appName in
|
||||
AppButton(
|
||||
bundleID: bundleID,
|
||||
appName: appName,
|
||||
recentApps: $recentApps,
|
||||
favoriteApps: $favoriteApps,
|
||||
appIcons: $appIcons,
|
||||
onSelectApp: onSelectApp
|
||||
)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
Section(header: Text("All Applications")) {
|
||||
ForEach(viewModel.apps.sorted(by: { $0.key < $1.key }), id: \.key) { bundleID, appName in
|
||||
AppButton(
|
||||
bundleID: bundleID,
|
||||
appName: appName,
|
||||
recentApps: $recentApps,
|
||||
favoriteApps: $favoriteApps,
|
||||
appIcons: $appIcons,
|
||||
onSelectApp: onSelectApp
|
||||
)
|
||||
}
|
||||
Section(header: Text((favoriteApps.isEmpty && recentApps.isEmpty) ? "" : "All Applications")) {
|
||||
ForEach(viewModel.apps.sorted(by: { $0.key < $1.key }), id: \.key) { bundleID, appName in
|
||||
AppButton(
|
||||
bundleID: bundleID,
|
||||
appName: appName,
|
||||
recentApps: $recentApps,
|
||||
favoriteApps: $favoriteApps,
|
||||
appIcons: $appIcons,
|
||||
onSelectApp: onSelectApp,
|
||||
sharedDefaults: sharedDefaults
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -143,13 +130,14 @@ Please check if the app you want to connect to is signed with a **development**
|
|||
}
|
||||
|
||||
struct AppButton: View {
|
||||
@State var bundleID: String
|
||||
@State var appName: String
|
||||
let bundleID: String
|
||||
let appName: String
|
||||
@Binding var recentApps: [String]
|
||||
@Binding var favoriteApps: [String]
|
||||
@Binding var appIcons: [String: UIImage]
|
||||
@AppStorage("loadAppIconsOnJIT") private var loadAppIconsOnJIT = true
|
||||
var onSelectApp: (String) -> Void
|
||||
let sharedDefaults: UserDefaults
|
||||
|
||||
@Environment(\.colorScheme) private var colorScheme
|
||||
|
||||
|
|
@ -163,18 +151,14 @@ struct AppButton: View {
|
|||
.padding(.vertical, loadAppIconsOnJIT ? 0 : 8)
|
||||
}
|
||||
.contextMenu {
|
||||
Button {
|
||||
toggleFavorite()
|
||||
} label: {
|
||||
Button(action: toggleFavorite) {
|
||||
Label(
|
||||
favoriteApps.contains(bundleID) ? "Remove Favorite" : "Add to Favorites",
|
||||
systemImage: favoriteApps.contains(bundleID) ? "star.slash" : "star"
|
||||
)
|
||||
.disabled(!favoriteApps.contains(bundleID) && favoriteApps.count >= 4)
|
||||
}
|
||||
|
||||
Button {
|
||||
UIPasteboard.general.string = bundleID
|
||||
} label: {
|
||||
Button { UIPasteboard.general.string = bundleID } label: {
|
||||
Label("Copy Bundle ID", systemImage: "doc.on.doc")
|
||||
}
|
||||
}
|
||||
|
|
@ -184,23 +168,14 @@ struct AppButton: View {
|
|||
Group {
|
||||
if loadAppIconsOnJIT, let image = appIcons[bundleID] {
|
||||
Image(uiImage: image)
|
||||
.resizable()
|
||||
.aspectRatio(contentMode: .fit)
|
||||
.frame(width: 60, height: 60)
|
||||
.cornerRadius(12)
|
||||
.shadow(
|
||||
color: colorScheme == .dark ? .black.opacity(0.2) : .gray.opacity(0.2),
|
||||
radius: 3, x: 0, y: 1
|
||||
)
|
||||
.resizable().aspectRatio(contentMode: .fit)
|
||||
.frame(width: 60, height: 60).cornerRadius(12)
|
||||
.shadow(color: colorScheme == .dark ? .black.opacity(0.2) : .gray.opacity(0.2), radius: 3, x: 0, y: 1)
|
||||
} else {
|
||||
RoundedRectangle(cornerRadius: 12)
|
||||
.fill(Color(UIColor.systemGray5))
|
||||
.frame(width: 60, height: 60)
|
||||
.overlay(
|
||||
Image(systemName: "app")
|
||||
.font(.system(size: 26))
|
||||
.foregroundColor(.gray)
|
||||
)
|
||||
.overlay(Image(systemName: "app").font(.system(size: 26)).foregroundColor(.gray))
|
||||
.shadow(color: .black.opacity(0.1), radius: 2, x: 0, y: 1)
|
||||
.onAppear { loadAppIcon(for: bundleID) }
|
||||
}
|
||||
|
|
@ -209,31 +184,30 @@ struct AppButton: View {
|
|||
|
||||
private var appText: some View {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
Text(appName)
|
||||
.font(.system(size: 18, weight: .semibold))
|
||||
.foregroundColor(.primary)
|
||||
Text(bundleID)
|
||||
.font(.system(size: 15))
|
||||
.foregroundColor(.gray)
|
||||
.lineLimit(1)
|
||||
Text(appName).font(.system(size: 18, weight: .semibold)).foregroundColor(.primary)
|
||||
Text(bundleID).font(.system(size: 15)).foregroundColor(.gray).lineLimit(1)
|
||||
}
|
||||
}
|
||||
|
||||
private func selectApp() {
|
||||
recentApps.removeAll(where: { $0 == bundleID })
|
||||
recentApps.removeAll { $0 == bundleID }
|
||||
recentApps.insert(bundleID, at: 0)
|
||||
if recentApps.count > 3 {
|
||||
recentApps = Array(recentApps.prefix(3))
|
||||
}
|
||||
if recentApps.count > 3 { recentApps = Array(recentApps.prefix(3)) }
|
||||
sharedDefaults.set(recentApps, forKey: "recentApps")
|
||||
sharedDefaults.set(favoriteApps, forKey: "favoriteApps")
|
||||
WidgetCenter.shared.reloadAllTimelines()
|
||||
onSelectApp(bundleID)
|
||||
}
|
||||
|
||||
private func toggleFavorite() {
|
||||
if favoriteApps.contains(bundleID) {
|
||||
favoriteApps.removeAll(where: { $0 == bundleID })
|
||||
} else {
|
||||
favoriteApps.removeAll { $0 == bundleID }
|
||||
} else if favoriteApps.count < 4 {
|
||||
favoriteApps.insert(bundleID, at: 0)
|
||||
}
|
||||
sharedDefaults.set(recentApps, forKey: "recentApps")
|
||||
sharedDefaults.set(favoriteApps, forKey: "favoriteApps")
|
||||
WidgetCenter.shared.reloadAllTimelines()
|
||||
}
|
||||
|
||||
private func loadAppIcon(for bundleID: String) {
|
||||
|
|
@ -243,6 +217,7 @@ struct AppButton: View {
|
|||
DispatchQueue.main.async {
|
||||
withAnimation(.easeIn(duration: 0.2)) {
|
||||
appIcons[bundleID] = image
|
||||
saveIconToGroup(image, bundleID: bundleID)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -250,6 +225,17 @@ struct AppButton: View {
|
|||
}
|
||||
}
|
||||
|
||||
fileprivate func saveIconToGroup(_ image: UIImage, bundleID: String) {
|
||||
guard
|
||||
let data = image.pngData(),
|
||||
let container = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.com.stik.sj")
|
||||
else { return }
|
||||
let iconsDir = container.appendingPathComponent("icons", isDirectory: true)
|
||||
try? FileManager.default.createDirectory(at: iconsDir, withIntermediateDirectories: true)
|
||||
let fileURL = iconsDir.appendingPathComponent("\(bundleID).png")
|
||||
try? data.write(to: fileURL)
|
||||
}
|
||||
|
||||
extension Array: @retroactive RawRepresentable where Element: Codable {
|
||||
public init?(rawValue: String) {
|
||||
guard let data = rawValue.data(using: .utf8),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue