Code improves

powenn · Jul 14, 2022 · 6a2bd7a · 6a2bd7a
1 parent a216057
commit 6a2bd7a
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 49 deletions.
diff --git a/...eproj/project.xcworkspace/xcuserdata/xiaobowen.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/xiaobowen.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/permasigneriOS/CheckApp.swift b/permasigneriOS/CheckApp.swift
@@ -14,26 +14,26 @@ class CheckApp: ObservableObject {
 
     static let shared = CheckApp()
 
-    @Published var appNameInPayload:String = ""
-    @Published var payloadPath:URL = URL(fileURLWithPath: "")
+    var appNameInPayload:String = ""
+    var payloadPath:URL = URL(fileURLWithPath: "")
 
     @Published var fileName:String = ""
-    @Published var filePath:String = ""
+    var filePath:String = ""
 
     var destination = URL(fileURLWithPath: "")
     var fileDir = URL(fileURLWithPath: "")
 
     // App Info vars
     var config: [String: Any]?
     var InfoPlistPath = URL(string: "")
-    @Published var app_name:String = ""
+    var app_name:String = ""
     @Published var app_bundle:String = ""
-    @Published var app_version:String = ""
-    @Published var app_min_ios:String = ""
-    @Published var app_author:String = ""
+    var app_version:String = ""
+    var app_min_ios:String = ""
+    var app_author:String = ""
 
-    @Published var app_executable:String? = nil
-    @Published var validInfoPlist:Bool = false
+    var app_executable:String? = nil
+    var validInfoPlist:Bool = false
     // ----------------------------
 
     func extractIpa() {

diff --git a/permasigneriOS/PackToDeb.swift b/permasigneriOS/PackToDeb.swift
@@ -12,7 +12,7 @@ class Progress: ObservableObject {
     private init() { }
     static let shared = Progress()
 
-    @Published var OutputDebFilePath = ""
+    var OutputDebFilePath = ""
 //    @Published var Percent = 1.0
     @Published var ProgressingDescribe = ""
     @Published var CustomDebDescription = ""

diff --git a/permasigneriOS/Views/SignView.swift b/permasigneriOS/Views/SignView.swift
@@ -81,14 +81,14 @@ struct SignView: View {
             }
             .padding()
 
-            Button(action: {
-                ShowCustomInfo.toggle()
-            }, label: {
-                Text("Custom Info")
-            }).sheet(isPresented: $ShowCustomInfo, content: {
-                CustomInfoView()
-            }).disabled(checkapp.fileName == "" || progress.ProgressingDescribe != "" || isImporting)
-            
+//            Button(action: {
+//                ShowCustomInfo.toggle()
+//            }, label: {
+//                Text("Custom Info")
+//            }).sheet(isPresented: $ShowCustomInfo, content: {
+//                CustomInfoView()
+//            }).disabled(checkapp.fileName == "" || progress.ProgressingDescribe != "" || isImporting)
+
             Button(action: {
                 DispatchQueue.global(qos: .userInitiated).async {
                     progress.permanentSignButtonFunc()
@@ -134,42 +134,41 @@ struct SignView: View {
 }
 
 
-struct CustomInfoView: View {
-    @StateObject var checkapp: CheckApp = .shared
-    @StateObject var progress: Progress = .shared
-    @Environment(\.presentationMode) var presentationMode
-    
-    var body: some View {
-        VStack{
-            VStack(alignment: .leading) {
-                Text("Customize App Bundle")
-                TextField("App Bundle", text: $checkapp.app_bundle)
-                    .textFieldStyle(.roundedBorder)
-                Text("Customize deb file description\n( Leave blank to use default )")
-                TextField("Description", text: $progress.CustomDebDescription)
-                    .textFieldStyle(.roundedBorder)
-                Text("You can click TextField to dismiss keyboard")
-                    .font(.footnote)
-                    .foregroundColor(.gray)
-            }.padding()
-            Button(action: {
-                self.presentationMode.wrappedValue.dismiss()
-            }, label: {
-                Text("Done")
-            }).padding()
-        }
-        .padding()
-        .onTapGesture {
-            hideKeyboard()
-        }
-    }
-}
+//struct CustomInfoView: View {
+//    @StateObject var checkapp: CheckApp = .shared
+//    @StateObject var progress: Progress = .shared
+//    @Environment(\.presentationMode) var presentationMode
+//
+//    var body: some View {
+//        VStack{
+//            VStack(alignment: .leading) {
+//                Text("Customize App Bundle")
+//                TextField("App Bundle", text: $checkapp.app_bundle)
+//                    .textFieldStyle(.roundedBorder)
+//                Text("Customize deb file description\n( Leave blank to use default )")
+//                TextField("Description", text: $progress.CustomDebDescription)
+//                    .textFieldStyle(.roundedBorder)
+//                Text("You can click TextField to dismiss keyboard")
+//                    .font(.footnote)
+//                    .foregroundColor(.gray)
+//            }.padding()
+//            Button(action: {
+//                self.presentationMode.wrappedValue.dismiss()
+//            }, label: {
+//                Text("Done")
+//            }).padding()
+//        }
+//        .padding()
+//        .onTapGesture {
+//            hideKeyboard()
+//        }
+//    }
+//}
 
 
 struct SignView_Previews: PreviewProvider {
     static var previews: some View {
         SignView()
-        CustomInfoView()
     }
 }