Skip to content

Commit

Permalink
1.1.2 RC2
Browse files Browse the repository at this point in the history
  • Loading branch information
Constantin Clerc committed Feb 22, 2024
1 parent 4de4b23 commit 5639788
Show file tree
Hide file tree
Showing 4 changed files with 380 additions and 38 deletions.
4 changes: 4 additions & 0 deletions Geranium.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
79D7891D2B41BDE700FEBD32 /* Bouquet.png in Resources */ = {isa = PBXBuildFile; fileRef = 79D7891C2B41BDE700FEBD32 /* Bouquet.png */; };
79D7891F2B41BEA600FEBD32 /* Flore.png in Resources */ = {isa = PBXBuildFile; fileRef = 79D7891E2B41BEA600FEBD32 /* Flore.png */; };
79DF26992B31C90C005D81D2 /* WelcomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DF26982B31C90C005D81D2 /* WelcomeView.swift */; };
79FDECC92B878F4700B2DFB0 /* NotifHelp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FDECC82B878F4700B2DFB0 /* NotifHelp.swift */; };
FAA456D52B265FEA00FC7287 /* GeraniumApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAA456D42B265FEA00FC7287 /* GeraniumApp.swift */; };
FAA456D72B265FEA00FC7287 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAA456D62B265FEA00FC7287 /* ContentView.swift */; };
FAA456D92B265FEC00FC7287 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FAA456D82B265FEC00FC7287 /* Assets.xcassets */; };
Expand Down Expand Up @@ -124,6 +125,7 @@
79D7891C2B41BDE700FEBD32 /* Bouquet.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Bouquet.png; sourceTree = "<group>"; };
79D7891E2B41BEA600FEBD32 /* Flore.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Flore.png; sourceTree = "<group>"; };
79DF26982B31C90C005D81D2 /* WelcomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeView.swift; sourceTree = "<group>"; };
79FDECC82B878F4700B2DFB0 /* NotifHelp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotifHelp.swift; sourceTree = "<group>"; };
FAA456D12B265FEA00FC7287 /* Geranium.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Geranium.app; sourceTree = BUILT_PRODUCTS_DIR; };
FAA456D42B265FEA00FC7287 /* GeraniumApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeraniumApp.swift; sourceTree = "<group>"; };
FAA456D62B265FEA00FC7287 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -347,6 +349,7 @@
isa = PBXGroup;
children = (
FAA4572F2B2666F300FC7287 /* CleanerView.swift */,
79FDECC82B878F4700B2DFB0 /* NotifHelp.swift */,
792845522B2C67910021E1FD /* FileCleaner.swift */,
799D42452B553AF1001867E0 /* CustomPaths.swift */,
7916D9E52B34FC06008E88F2 /* Paths.swift */,
Expand Down Expand Up @@ -556,6 +559,7 @@
793E3D6F2B37AA1300A72671 /* BetaChecker.swift in Sources */,
7989FD082B34894400FBAB8D /* BookMarkSlider.swift in Sources */,
7916D9E62B34FC06008E88F2 /* Paths.swift in Sources */,
79FDECC92B878F4700B2DFB0 /* NotifHelp.swift in Sources */,
7916D9E42B34D9C4008E88F2 /* CurrentlyDisabledDaemonView.swift in Sources */,
FAA457122B2661E300FC7287 /* TSUtil.m in Sources */,
7989FD062B3486B100FBAB8D /* CustomMapView.swift in Sources */,
Expand Down
40 changes: 28 additions & 12 deletions Geranium/Cleaner/CleanerView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ struct CleanerView: View {
@State var resultView: Bool = false
@State var wannaReboot: Bool = false
@State var customPathSheet: Bool = false
@State var needHelpWithMyNotifs: Bool = false
@State var shouldIGetSizes = AppSettings().getSizes

// User Selection
Expand Down Expand Up @@ -278,18 +279,30 @@ struct CleanerView: View {
.bold()
}
}
ToolbarItem(placement: .navigationBarTrailing) {
Button(action: {
customPathSheet.toggle()
}) {
if defaultView {
Image(systemName: "folder.badge.plus")
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: 24, height: 24)
}
}
}
ToolbarItem(placement: .navigationBarTrailing) {
Button(action: {
needHelpWithMyNotifs.toggle()
}) {
if defaultView, ProcessInfo().operatingSystemVersion.majorVersion == 15 {
Image(systemName: "bell.badge")
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: 24, height: 24)
}
}
}
ToolbarItem(placement: .navigationBarTrailing) {
Button(action: {
customPathSheet.toggle()
}) {
if defaultView {
Image(systemName: "folder.badge.plus")
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: 24, height: 24)
}
}
}
}
.sheet(isPresented: $customPathSheet) {
CustomPaths()
Expand All @@ -299,6 +312,9 @@ struct CleanerView: View {
}, noCancel: true)
}
}
.sheet(isPresented: $needHelpWithMyNotifs) {
NotifHelp()
}
}
func performCleanup() {
cleanProcess(lowSize: isLowSize, safari: safari, appCaches: appCaches, otaCaches: otaCaches, leftOverCaches:
Expand Down
50 changes: 50 additions & 0 deletions Geranium/Cleaner/NotifHelp.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
//
// NotifHelp.swift
// Geranium
//
// Created by Constantin Clerc on 22.02.2024.
//

import SwiftUI

struct NotifHelp: View {
var body: some View {
NavigationView {
List {
Section(header: Text("Issue"), footer: Text("You might lose some unimportant data, such as WiFi passwords and preferences.")) {
Text("Lost your notifications because of the cleaner ? Don't panic, here is the solution !")
}
Section(header: Text("The procedure")) {
Text("First, you need to open Settings. The app can do it for you if you want. Then, go in **General**, scroll down, and go in **Reset**.")
Button("Open Settings") {
if let url = URL(string:UIApplication.openSettingsURLString) {
if UIApplication.shared.canOpenURL(url) {
UIApplication.shared.open(url, options: [:], completionHandler: nil)
}
}
}
}
Section() {
Text("Then, you need to press the **Reset** button (NOT the erase all contents and settings)")
}
Section() {
Text("Press **Reset All Settings**, follow what's on your screen and you are done !")
}
}
.toolbar {
ToolbarItem(placement: .principal) {
Text("Additional Help")
.font(.title2)
.bold()
.padding(.top, 10)
}
}

}
.environment(\.defaultMinListRowHeight, 50)
}
}

#Preview {
NotifHelp()
}
Loading

1 comment on commit 5639788

@c22dev
Copy link
Owner

@c22dev c22dev commented on 5639788 Feb 22, 2024

Choose a reason for hiding this comment

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

Semi-fixes #10

Please sign in to comment.