Skip to content

Commit

Permalink
v3.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@alienator88
alienator88 committed Mar 3, 2024
1 parent 6d94a36 commit 7895996
Show file tree
Hide file tree
Showing 9 changed files with 106 additions and 41 deletions.
8 changes: 4 additions & 4 deletions Pearcleaner.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 19;
CURRENT_PROJECT_VERSION = 20;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = BK8443AXLU;
Expand All @@ -557,7 +557,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 3.0.0;
MARKETING_VERSION = 3.0.1;
PRODUCT_BUNDLE_IDENTIFIER = com.alienator88.Pearcleaner;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand All @@ -574,7 +574,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 19;
CURRENT_PROJECT_VERSION = 20;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = BK8443AXLU;
Expand All @@ -592,7 +592,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 3.0.0;
MARKETING_VERSION = 3.0.1;
PRODUCT_BUNDLE_IDENTIFIER = com.alienator88.Pearcleaner;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down
1 change: 1 addition & 0 deletions Pearcleaner/Logic/Locations.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class Locations: ObservableObject {
"\(home)/Library/Preferences",
"\(home)/Library/Preferences/ByHost",
"\(home)/Library/Saved Application State",
"\(home)/Library/Services",
"\(home)/Library/WebKit",
"/Users/Shared",
"/Users/Library",
Expand Down
5 changes: 3 additions & 2 deletions Pearcleaner/Logic/Styles.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,7 @@ struct FilesViewActionButton: ButtonStyle {




struct SentinelToggleStyle: ToggleStyle {

func makeBody(configuration: Configuration) -> some View {
Expand Down Expand Up @@ -669,7 +670,7 @@ struct PearDropView: View {
VStack(alignment: .center, spacing: 0) {
HStack(spacing: 0) {
LinearGradient(gradient: Gradient(colors: [.green, .orange]), startPoint: .leading, endPoint: .trailing)
.frame(width: 195)
.frame(width: 220)
LinearGradient(gradient: Gradient(colors: [.orange, Color("mode").opacity(0.5)]), startPoint: .leading, endPoint: .trailing)
.frame(width: 10)
LinearGradient(gradient: Gradient(colors: [Color("mode").opacity(0.5), Color("mode").opacity(0.5)]), startPoint: .leading, endPoint: .trailing)
Expand All @@ -679,7 +680,7 @@ struct PearDropView: View {
Image("logo_text_small")
.resizable()
.scaledToFit()
.frame(width: 500, height: 120)
.frame(width: 500)
.padding()
)

Expand Down
3 changes: 2 additions & 1 deletion Pearcleaner/PearcleanerApp.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ struct PearcleanerApp: App {
loadAllPaths(allApps: sortedApps.userApps + sortedApps.systemApps, appState: appState, locations: locations)
}

getFeatures(appState: appState, show: $showFeature, features: $features)


#if !DEBUG
Task {
Expand All @@ -114,6 +114,7 @@ struct PearcleanerApp: App {
// Check for updates after app launch
if diskP {
loadGithubReleases(appState: appState)
getFeatures(appState: appState, show: $showFeature, features: $features)
}

// Check for disk/accessibility permissions just once on initial app launch
Expand Down
8 changes: 4 additions & 4 deletions Pearcleaner/Resources/Assets.xcassets/AccentColor.colorset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0x59",
"green" : "0x48",
"blue" : "0xFF",
"green" : "0xFF",
"red" : "0xFF"
}
},
Expand All @@ -23,8 +23,8 @@
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0x59",
"green" : "0x48",
"blue" : "0xFF",
"green" : "0xFF",
"red" : "0xFF"
}
},
Expand Down
38 changes: 38 additions & 0 deletions Pearcleaner/Resources/Assets.xcassets/windowBG.colorset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0xF6",
"green" : "0xF6",
"red" : "0xF6"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0x29",
"green" : "0x28",
"red" : "0x29"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
1 change: 1 addition & 0 deletions Pearcleaner/Settings/General.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ struct GeneralSettingsTab: View {
.font(.callout)
.foregroundStyle(.gray)
}
InfoButton(text: "When transparent material is enabled, sticky section headers (User/System) in app list are disabled to keep from showing app name text overlayed under the section header text with no background to separate the two.", color: nil)
Spacer()
Toggle(isOn: $glass, label: {
})
Expand Down
35 changes: 24 additions & 11 deletions Pearcleaner/Views/AppListView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,35 +64,46 @@ struct AppListView: View {
}
}
.padding(.top, 20)
.padding(.bottom)
// .padding(.bottom)

ScrollView {

LazyVStack(alignment: .leading, pinnedViews: [.sectionHeaders]) {
LazyVStack(alignment: .leading, spacing: 0, pinnedViews: [glass ? [] : .sectionHeaders]) {

if filteredUserApps.count > 0 {
VStack {
Header(title: "User", count: filteredUserApps.count, showPopover: $showPopover)
// VStack {
// Header(title: "User", count: filteredUserApps.count, showPopover: $showPopover)
ForEach(filteredUserApps, id: \.self) { appInfo in
AppListItems(search: $search, showPopover: $showPopover, appInfo: appInfo)
if appInfo != filteredUserApps.last {
Divider().padding(.horizontal, 5)
Section(header: Header(title: "User", count: filteredUserApps.count, showPopover: $showPopover)) {
AppListItems(search: $search, showPopover: $showPopover, appInfo: appInfo)
.padding(.vertical,5)
if appInfo != filteredUserApps.last {
Divider().padding(.horizontal, 5)
}
}
// AppListItems(search: $search, showPopover: $showPopover, appInfo: appInfo)
// if appInfo != filteredUserApps.last {
// Divider().padding(.horizontal, 5)
// }
}
}
// }

}

if filteredSystemApps.count > 0 {
VStack {
Header(title: "System", count: filteredSystemApps.count, showPopover: $showPopover)
// VStack {
// Header(title: "System", count: filteredSystemApps.count, showPopover: $showPopover)
Section(header: Header(title: "System", count: filteredSystemApps.count, showPopover: $showPopover)) {

ForEach(filteredSystemApps, id: \.self) { appInfo in
AppListItems(search: $search, showPopover: $showPopover, appInfo: appInfo)
.padding(.vertical,5)
if appInfo != filteredSystemApps.last {
Divider().padding(.horizontal, 5)
}
}
}
// }
}

}
Expand Down Expand Up @@ -199,6 +210,7 @@ struct Header: View {
@EnvironmentObject var locations: Locations
@Binding var showPopover: Bool
@AppStorage("settings.general.instant") private var instantSearch: Bool = true
@AppStorage("settings.general.glass") private var glass: Bool = true


var body: some View {
Expand Down Expand Up @@ -253,7 +265,8 @@ struct Header: View {
Spacer()

}
.padding(.vertical, 8)
.padding(.vertical, 9)
.padding(.leading, 6)
.background(!glass ? Color("windowBG") : .clear)
}
}
48 changes: 29 additions & 19 deletions Pearcleaner/Views/MiniMode.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,11 @@ struct MiniEmptyView: View {
Image(systemName: "plus.square.dashed")
.resizable()
.scaledToFit()
.frame(width: 100, height: 100)
.frame(width: 120, height: 120)
.padding()
.fontWeight(.ultraLight)
)
.frame(width: 160)
}

Text("Drop your app here")
Expand Down Expand Up @@ -142,6 +144,7 @@ struct MiniAppView: View {
@State private var showUsr: Bool = true
@AppStorage("settings.general.mini") private var mini: Bool = false
@AppStorage("settings.general.instant") private var instantSearch: Bool = true
@AppStorage("settings.general.glass") private var glass: Bool = true
@Binding var showPopover: Bool

var body: some View {
Expand Down Expand Up @@ -185,43 +188,50 @@ struct MiniAppView: View {

ScrollView {

LazyVStack(alignment: .leading, pinnedViews: [.sectionHeaders]) {
LazyVStack(alignment: .leading, spacing: 0, pinnedViews: [glass ? [] : .sectionHeaders]) {

if filteredUserApps.count > 0 {

VStack {
Header(title: "User", count: filteredUserApps.count, showPopover: $showPopover)
ForEach(filteredUserApps, id: \.self) { appInfo in
AppListItems(search: $search, showPopover: $showPopover, appInfo: appInfo)
if appInfo != filteredUserApps.last {
Divider().padding(.horizontal, 5)
// VStack {
// Header(title: "User", count: filteredUserApps.count, showPopover: $showPopover)
Section(header: Header(title: "User", count: filteredUserApps.count, showPopover: $showPopover)) {

ForEach(filteredUserApps, id: \.self) { appInfo in
AppListItems(search: $search, showPopover: $showPopover, appInfo: appInfo)
// .padding(.vertical,5)
if appInfo != filteredUserApps.last {
Divider().padding(.horizontal, 5)
}
}
}
}
// }

}

if filteredSystemApps.count > 0 {

VStack {
Header(title: "System", count: filteredSystemApps.count, showPopover: $showPopover)
ForEach(filteredSystemApps, id: \.self) { appInfo in
AppListItems(search: $search, showPopover: $showPopover, appInfo: appInfo)
if appInfo != filteredSystemApps.last {
Divider().padding(.horizontal, 5)
// VStack {
// Header(title: "System", count: filteredSystemApps.count, showPopover: $showPopover)
Section(header: Header(title: "System", count: filteredSystemApps.count, showPopover: $showPopover)) {
ForEach(filteredSystemApps, id: \.self) { appInfo in
AppListItems(search: $search, showPopover: $showPopover, appInfo: appInfo)
.padding(.vertical,5)
if appInfo != filteredSystemApps.last {
Divider().padding(.horizontal, 5)
}
}
}
}
// }
}

}
.padding(.horizontal)

}
.scrollIndicators(.never)

if appState.currentView != .empty {
SearchBarMiniBottom(search: $search)
SearchBarMiniBottom(search: $search).background(.ultraThinMaterial)
}
}
.padding(.bottom)
Expand Down

0 comments on commit 7895996

Please sign in to comment.