fix: aussie mode getting stuck

castdrian · castdrian · commit d22f4454d3fc · 2024-04-23T14:07:34.000+02:00
diff --git a/ishare.xcodeproj/project.pbxproj b/ishare.xcodeproj/project.pbxproj
@@ -602,7 +602,7 @@
 				CURRENT_PROJECT_VERSION = "${BUILD_NUMBER}";
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "";
-				DEVELOPMENT_TEAM = LT2SM56C52;
+				DEVELOPMENT_TEAM = L988J7YMK5;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_TESTING_SEARCH_PATHS = NO;
@@ -640,7 +640,7 @@
 				CURRENT_PROJECT_VERSION = "${BUILD_NUMBER}";
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "";
-				DEVELOPMENT_TEAM = LT2SM56C52;
+				DEVELOPMENT_TEAM = L988J7YMK5;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_TESTABILITY = NO;
diff --git a/ishare.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ishare.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/ishare/Views/Settings/UploaderSettings.swift b/ishare/Views/Settings/UploaderSettings.swift
@@ -13,6 +13,7 @@ struct UploaderSettingsView: View {
     @Default(.activeCustomUploader) var activeCustomUploader
     @Default(.savedCustomUploaders) var savedCustomUploaders
     @Default(.uploadType) var uploadType
+    @Default(.aussieMode) var aussieMode
     
     @State private var isAddSheetPresented = false
     @State private var isImportSheetPresented = false
@@ -115,6 +116,7 @@ struct UploaderSettingsView: View {
             }
             .padding(.bottom)
         }
+        .rotationEffect(aussieMode ? .degrees(180) : .zero)
         .sheet(isPresented: $isAddSheetPresented) {
             AddCustomUploaderView()
                 .frame(minWidth: 450)
diff --git a/ishare/Views/SettingsMenuView.swift b/ishare/Views/SettingsMenuView.swift
@@ -16,30 +16,30 @@ import ScreenCaptureKit
 
 struct SettingsMenuView: View {
     @Default(.aussieMode) var aussieMode
-    
+
     let appVersionString: String = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as! String
     
     var body: some View {
         NavigationView {
             VStack {
                 List {
                     NavigationLink(destination: GeneralSettingsView()) {
-                        Label("General", systemImage: "gearshape")
+                        Label("General", systemImage: "gearshape").rotationEffect(aussieMode ? .degrees(180) : .zero)
                     }
                     NavigationLink(destination: UploaderSettingsView()) {
-                        Label("Uploaders", systemImage: "icloud.and.arrow.up")
+                        Label("Uploaders", systemImage: "icloud.and.arrow.up").rotationEffect(aussieMode ? .degrees(180) : .zero)
                     }
                     NavigationLink(destination: KeybindSettingsView()) {
-                        Label("Keybinds", systemImage: "command.circle")
+                        Label("Keybinds", systemImage: "command.circle").rotationEffect(aussieMode ? .degrees(180) : .zero)
                     }
                     NavigationLink(destination: CaptureSettingsView()) {
-                        Label("Image files", systemImage: "photo")
+                        Label("Image files", systemImage: "photo").rotationEffect(aussieMode ? .degrees(180) : .zero)
                     }
                     NavigationLink(destination: RecordingSettingsView()) {
-                        Label("Video files", systemImage: "menubar.dock.rectangle.badge.record")
+                        Label("Video files", systemImage: "menubar.dock.rectangle.badge.record").rotationEffect(aussieMode ? .degrees(180) : .zero)
                     }
                     NavigationLink(destination: AdvancedSettingsView()) {
-                        Label("Advanced", systemImage: "hammer.circle")
+                        Label("Advanced", systemImage: "hammer.circle").rotationEffect(aussieMode ? .degrees(180) : .zero)
                     }
                 }
                 .listStyle(SidebarListStyle())
@@ -52,6 +52,7 @@ struct SettingsMenuView: View {
                         Text("GitHub")
                     }
                 }
+                .rotationEffect(aussieMode ? .degrees(180) : .zero)
                 .padding()
                 .frame(maxWidth: .infinity, alignment: .center)
             }
@@ -60,7 +61,6 @@ struct SettingsMenuView: View {
             GeneralSettingsView() // default view
         }
         .frame(minWidth: 600, maxWidth: 600, minHeight: 300, maxHeight: 300)
-        .rotationEffect(aussieMode ? .degrees(180) : .zero)
         .navigationTitle("Settings")
     }
 }
@@ -89,7 +89,6 @@ struct GeneralSettingsView: View {
     var body: some View {
         VStack(alignment: .leading) {
             Spacer()
-            Text("ishare").font(.largeTitle).frame(maxWidth: .infinity).padding(-10)
             
             HStack() {
                 VStack(alignment: .leading) {
@@ -100,7 +99,7 @@ struct GeneralSettingsView: View {
                 Spacer()
                 
                 VStack {
-                    Text("Menu Icon")
+                    Text("Menu Bar Icon")
                     
                     HStack {
                         ForEach(MenuBarIcon.allCases, id: \.self) { choice in
@@ -165,11 +164,13 @@ struct GeneralSettingsView: View {
             .padding(0)
             .frame(maxWidth: .infinity)
         }
-        .padding()
+        .padding().rotationEffect(aussieMode ? .degrees(180) : .zero)
     }
 }
 
 struct KeybindSettingsView: View {
+    @Default(.aussieMode) var aussieMode
+    
     var body: some View {
         Spacer()
         
@@ -193,14 +194,15 @@ struct KeybindSettingsView: View {
                 .foregroundColor(.red)
                 .frame(maxWidth: .infinity)
         }
-        .padding()
+        .padding().rotationEffect(aussieMode ? .degrees(180) : .zero)
     }
 }
 
 struct CaptureSettingsView: View {
     @Default(.capturePath) var capturePath
     @Default(.captureFileType) var fileType
     @Default(.captureFileName) var fileName
+    @Default(.aussieMode) var aussieMode
     
     var body: some View {
         VStack(alignment: .leading) {
@@ -241,7 +243,7 @@ struct CaptureSettingsView: View {
                 }.labelsHidden()
             }.padding()
             
-        }.padding()
+        }.padding().rotationEffect(aussieMode ? .degrees(180) : .zero)
     }
 }
 
@@ -252,6 +254,7 @@ struct RecordingSettingsView: View {
     @Default(.recordMP4) var recordMP4
     @Default(.useHEVC) var useHEVC
     @Default(.compressVideo) var compressVideo
+    @Default(.aussieMode) var aussieMode
     
     @State private var isExcludedAppSheetPresented = false
     
@@ -311,14 +314,15 @@ struct RecordingSettingsView: View {
                 .sheet(isPresented: $isExcludedAppSheetPresented) {
                     ExcludedAppsView().frame(maxHeight: 500)
                 }
-        }
+        }.rotationEffect(aussieMode ? .degrees(180) : .zero)
     }
 }
 
 struct AdvancedSettingsView: View {
     @State private var showingAlert: Bool = false
     @Default(.imgurClientId) var imgurClientId
     @Default(.captureBinary) var captureBinary
+    @Default(.aussieMode) var aussieMode
     
     var body: some View {
         VStack{
@@ -350,7 +354,7 @@ struct AdvancedSettingsView: View {
                 }
             }
             Spacer()
-        }.padding()
+        }.padding().rotationEffect(aussieMode ? .degrees(180) : .zero)
             .alert(Text("Advanced Settings"),
                    isPresented: $showingAlert,
                    actions: {

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ struct UploaderSettingsView: View {`
`13`	`13`	`@Default(.activeCustomUploader) var activeCustomUploader`
`14`	`14`	`@Default(.savedCustomUploaders) var savedCustomUploaders`
`15`	`15`	`@Default(.uploadType) var uploadType`
	`16`	`+ @Default(.aussieMode) var aussieMode`
`16`	`17`
`17`	`18`	`@State private var isAddSheetPresented = false`
`18`	`19`	`@State private var isImportSheetPresented = false`
`@@ -115,6 +116,7 @@ struct UploaderSettingsView: View {`
`115`	`116`	`}`
`116`	`117`	`.padding(.bottom)`
`117`	`118`	`}`
	`119`	`+ .rotationEffect(aussieMode ? .degrees(180) : .zero)`
`118`	`120`	`.sheet(isPresented: $isAddSheetPresented) {`
`119`	`121`	`AddCustomUploaderView()`
`120`	`122`	`.frame(minWidth: 450)`
Original file line number	Diff line number	Diff line change
`@@ -16,30 +16,30 @@ import ScreenCaptureKit`
`16`	`16`
`17`	`17`	`struct SettingsMenuView: View {`
`18`	`18`	`@Default(.aussieMode) var aussieMode`
`19`		`-`
	`19`	`+`
`20`	`20`	`let appVersionString: String = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as! String`
`21`	`21`
`22`	`22`	`var body: some View {`
`23`	`23`	`NavigationView {`
`24`	`24`	`VStack {`
`25`	`25`	`List {`
`26`	`26`	`NavigationLink(destination: GeneralSettingsView()) {`
`27`		`- Label("General", systemImage: "gearshape")`
	`27`	`+ Label("General", systemImage: "gearshape").rotationEffect(aussieMode ? .degrees(180) : .zero)`
`28`	`28`	`}`
`29`	`29`	`NavigationLink(destination: UploaderSettingsView()) {`
`30`		`- Label("Uploaders", systemImage: "icloud.and.arrow.up")`
	`30`	`+ Label("Uploaders", systemImage: "icloud.and.arrow.up").rotationEffect(aussieMode ? .degrees(180) : .zero)`
`31`	`31`	`}`
`32`	`32`	`NavigationLink(destination: KeybindSettingsView()) {`
`33`		`- Label("Keybinds", systemImage: "command.circle")`
	`33`	`+ Label("Keybinds", systemImage: "command.circle").rotationEffect(aussieMode ? .degrees(180) : .zero)`
`34`	`34`	`}`
`35`	`35`	`NavigationLink(destination: CaptureSettingsView()) {`
`36`		`- Label("Image files", systemImage: "photo")`
	`36`	`+ Label("Image files", systemImage: "photo").rotationEffect(aussieMode ? .degrees(180) : .zero)`
`37`	`37`	`}`
`38`	`38`	`NavigationLink(destination: RecordingSettingsView()) {`
`39`		`- Label("Video files", systemImage: "menubar.dock.rectangle.badge.record")`
	`39`	`+ Label("Video files", systemImage: "menubar.dock.rectangle.badge.record").rotationEffect(aussieMode ? .degrees(180) : .zero)`
`40`	`40`	`}`
`41`	`41`	`NavigationLink(destination: AdvancedSettingsView()) {`
`42`		`- Label("Advanced", systemImage: "hammer.circle")`
	`42`	`+ Label("Advanced", systemImage: "hammer.circle").rotationEffect(aussieMode ? .degrees(180) : .zero)`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`.listStyle(SidebarListStyle())`
`@@ -52,6 +52,7 @@ struct SettingsMenuView: View {`
`52`	`52`	`Text("GitHub")`
`53`	`53`	`}`
`54`	`54`	`}`
	`55`	`+ .rotationEffect(aussieMode ? .degrees(180) : .zero)`
`55`	`56`	`.padding()`
`56`	`57`	`.frame(maxWidth: .infinity, alignment: .center)`
`57`	`58`	`}`
`@@ -60,7 +61,6 @@ struct SettingsMenuView: View {`
`60`	`61`	`GeneralSettingsView() // default view`
`61`	`62`	`}`
`62`	`63`	`.frame(minWidth: 600, maxWidth: 600, minHeight: 300, maxHeight: 300)`
`63`		`- .rotationEffect(aussieMode ? .degrees(180) : .zero)`
`64`	`64`	`.navigationTitle("Settings")`
`65`	`65`	`}`
`66`	`66`	`}`
`@@ -89,7 +89,6 @@ struct GeneralSettingsView: View {`
`89`	`89`	`var body: some View {`
`90`	`90`	`VStack(alignment: .leading) {`
`91`	`91`	`Spacer()`
`92`		`- Text("ishare").font(.largeTitle).frame(maxWidth: .infinity).padding(-10)`
`93`	`92`
`94`	`93`	`HStack() {`
`95`	`94`	`VStack(alignment: .leading) {`
`@@ -100,7 +99,7 @@ struct GeneralSettingsView: View {`
`100`	`99`	`Spacer()`
`101`	`100`
`102`	`101`	`VStack {`
`103`		`- Text("Menu Icon")`
	`102`	`+ Text("Menu Bar Icon")`
`104`	`103`
`105`	`104`	`HStack {`
`106`	`105`	`ForEach(MenuBarIcon.allCases, id: \.self) { choice in`
`@@ -165,11 +164,13 @@ struct GeneralSettingsView: View {`
`165`	`164`	`.padding(0)`
`166`	`165`	`.frame(maxWidth: .infinity)`
`167`	`166`	`}`
`168`		`- .padding()`
	`167`	`+ .padding().rotationEffect(aussieMode ? .degrees(180) : .zero)`
`169`	`168`	`}`
`170`	`169`	`}`
`171`	`170`
`172`	`171`	`struct KeybindSettingsView: View {`
	`172`	`+ @Default(.aussieMode) var aussieMode`
	`173`	`+`
`173`	`174`	`var body: some View {`
`174`	`175`	`Spacer()`
`175`	`176`
`@@ -193,14 +194,15 @@ struct KeybindSettingsView: View {`
`193`	`194`	`.foregroundColor(.red)`
`194`	`195`	`.frame(maxWidth: .infinity)`
`195`	`196`	`}`
`196`		`- .padding()`
	`197`	`+ .padding().rotationEffect(aussieMode ? .degrees(180) : .zero)`
`197`	`198`	`}`
`198`	`199`	`}`
`199`	`200`
`200`	`201`	`struct CaptureSettingsView: View {`
`201`	`202`	`@Default(.capturePath) var capturePath`
`202`	`203`	`@Default(.captureFileType) var fileType`
`203`	`204`	`@Default(.captureFileName) var fileName`
	`205`	`+ @Default(.aussieMode) var aussieMode`
`204`	`206`
`205`	`207`	`var body: some View {`
`206`	`208`	`VStack(alignment: .leading) {`
`@@ -241,7 +243,7 @@ struct CaptureSettingsView: View {`
`241`	`243`	`}.labelsHidden()`
`242`	`244`	`}.padding()`
`243`	`245`
`244`		`- }.padding()`
	`246`	`+ }.padding().rotationEffect(aussieMode ? .degrees(180) : .zero)`
`245`	`247`	`}`
`246`	`248`	`}`
`247`	`249`
`@@ -252,6 +254,7 @@ struct RecordingSettingsView: View {`
`252`	`254`	`@Default(.recordMP4) var recordMP4`
`253`	`255`	`@Default(.useHEVC) var useHEVC`
`254`	`256`	`@Default(.compressVideo) var compressVideo`
	`257`	`+ @Default(.aussieMode) var aussieMode`
`255`	`258`
`256`	`259`	`@State private var isExcludedAppSheetPresented = false`
`257`	`260`
`@@ -311,14 +314,15 @@ struct RecordingSettingsView: View {`
`311`	`314`	`.sheet(isPresented: $isExcludedAppSheetPresented) {`
`312`	`315`	`ExcludedAppsView().frame(maxHeight: 500)`
`313`	`316`	`}`
`314`		`- }`
	`317`	`+ }.rotationEffect(aussieMode ? .degrees(180) : .zero)`
`315`	`318`	`}`
`316`	`319`	`}`
`317`	`320`
`318`	`321`	`struct AdvancedSettingsView: View {`
`319`	`322`	`@State private var showingAlert: Bool = false`
`320`	`323`	`@Default(.imgurClientId) var imgurClientId`
`321`	`324`	`@Default(.captureBinary) var captureBinary`
	`325`	`+ @Default(.aussieMode) var aussieMode`
`322`	`326`
`323`	`327`	`var body: some View {`
`324`	`328`	`VStack{`
`@@ -350,7 +354,7 @@ struct AdvancedSettingsView: View {`
`350`	`354`	`}`
`351`	`355`	`}`
`352`	`356`	`Spacer()`
`353`		`- }.padding()`
	`357`	`+ }.padding().rotationEffect(aussieMode ? .degrees(180) : .zero)`
`354`	`358`	`.alert(Text("Advanced Settings"),`
`355`	`359`	`isPresented: $showingAlert,`
`356`	`360`	`actions: {`