Main Version 1.0.1 (#270)

fix: default url logic (#269)
42Box · May 2, 2024 · 9aeccfb · 9aeccfb
1 parent 678bdc7
commit 9aeccfb
Show file tree

Hide file tree

Showing 8 changed files with 115 additions and 26 deletions.
diff --git a/HowToUse.md b/HowToUse.md
@@ -0,0 +1,40 @@
+# 🔎 How To Use
+
+### Folder Edit
+
+|폴더 관리|
+|:---:|
+|<img alt="image" src="https:/42Box/iOS/assets/85754295/f5164646-5ba0-4193-b9b6-eb1c4e01163e">|
+|Manage folders|
+|<img alt="image" src="https:/42Box/iOS/assets/116494364/e07a8b51-97f6-4c45-a857-63bfb0e42564">|
+
+### Share Extension
+
+|앱 외부에서 가져오기|
+|:---:|
+|<img alt="image" src="https:/42Box/iOS/assets/85754295/cb1f0768-3fe6-40b1-9ca3-ff50f53119f4">|
+|Importing from the other App|
+|<img alt="image" src="https:/42Box/iOS/assets/116494364/448b6272-8b2e-4127-99f1-4a504ed1441a">|
+
+### Refresh Controller
+
+|내부에서 북마크 추가하기|
+|:---:|
+|<img alt="image" src="https:/42Box/iOS/assets/85754295/7e83aeb6-8518-4183-8084-48e70087a304">|
+|Internal Add Bookmark|
+|<img alt="image" src="https:/42Box/iOS/assets/116494364/9c8dfdaf-d1da-4e7a-bca9-221017dc1e5d">|
+
+### Shortcuts for bookmark lists
+
+|북마크리스트들의 상호작용|
+|:---:|
+|<img alt="image" src="https:/42Box/iOS/assets/85754295/82a5941c-e7d1-43f4-96bd-649ecfcc312e">|
+|Preview, Context menu|
+|<img alt="image" src="https:/42Box/iOS/assets/116494364/0d1a1e51-f9d5-4c65-9883-538c95a977ed">|
+
+### Settings menu
+|테마 및 설정|
+|:---:|
+|<img alt="image" src="https:/42Box/iOS/assets/85754295/73f09320-2d85-4ba3-a3b8-067a49a33c55">|
+|Theme and Settings|
+|<img alt="image" src="https:/42Box/iOS/assets/116494364/edda41cb-e6f9-4113-9b98-7851efe24a58">|
diff --git a/Project.swift b/Project.swift
@@ -9,6 +9,14 @@ protocol ProjectFactory {
  func generateTarget() -> [Target]
 }
 
+// MARK: - Plist.Value Extension
+extension Plist.Value {
+ static var displayName: Plist.Value = "42Box"
+ static var displayShareExtensionName: Plist.Value = "42Box.Share"
+ static var appVersion: Plist.Value = "1.0.1"
+
+}
+
 // MARK: - iBox Factory
 
 class iBoxFactory: ProjectFactory {
@@ -29,9 +37,9 @@ class iBoxFactory: ProjectFactory {
 
  private let appInfoPlist: [String: Plist.Value] = [
  "ITSAppUsesNonExemptEncryption": false,
- "CFBundleDisplayName": "42Box",
+ "CFBundleDisplayName": Plist.Value.displayName,
  "CFBundleName": "iBox",
- "CFBundleShortVersionString": "1.0.0",
+ "CFBundleShortVersionString": Plist.Value.appVersion,
  "CFBundleVersion": "1",
  "UILaunchStoryboardName": "LaunchScreen",
  "UIApplicationSceneManifest": [
@@ -58,8 +66,8 @@ class iBoxFactory: ProjectFactory {
  ]
 
  private let shareExtensionInfoPlist: [String: Plist.Value] = [
- "CFBundleDisplayName": "42Box.Share",
- "CFBundleShortVersionString": "1.0.0",
+ "CFBundleDisplayName": Plist.Value.displayShareExtensionName,
+ "CFBundleShortVersionString": Plist.Value.appVersion,
  "CFBundleVersion": "1",
  "NSExtension": [
  "NSExtensionAttributes": [

diff --git a/README.md b/README.md
@@ -98,3 +98,47 @@
  </tr>
 
 </table>
+
+<br/>
+<br/>
+
+# 🔎 How To Use
+
+### Folder Edit
+
+|폴더 관리|
+|:---:|
+|<img alt="image" src="https:/42Box/iOS/assets/85754295/f5164646-5ba0-4193-b9b6-eb1c4e01163e">|
+|Manage folders|
+|<img alt="image" src="https:/42Box/iOS/assets/116494364/e07a8b51-97f6-4c45-a857-63bfb0e42564">|
+
+### Share Extension
+
+|앱 외부에서 가져오기|
+|:---:|
+|<img alt="image" src="https:/42Box/iOS/assets/85754295/cb1f0768-3fe6-40b1-9ca3-ff50f53119f4">|
+|Importing from the other App|
+|<img alt="image" src="https:/42Box/iOS/assets/116494364/448b6272-8b2e-4127-99f1-4a504ed1441a">|
+
+### Refresh Controller
+
+|내부에서 북마크 추가하기|
+|:---:|
+|<img alt="image" src="https:/42Box/iOS/assets/85754295/7e83aeb6-8518-4183-8084-48e70087a304">|
+|Internal Add Bookmark|
+|<img alt="image" src="https:/42Box/iOS/assets/116494364/9c8dfdaf-d1da-4e7a-bca9-221017dc1e5d">|
+
+### Shortcuts for bookmark lists
+
+|북마크리스트들의 상호작용|
+|:---:|
+|<img alt="image" src="https:/42Box/iOS/assets/85754295/82a5941c-e7d1-43f4-96bd-649ecfcc312e">|
+|Preview, Context menu|
+|<img alt="image" src="https:/42Box/iOS/assets/116494364/0d1a1e51-f9d5-4c65-9883-538c95a977ed">|
+
+### Settings menu
+|테마 및 설정|
+|:---:|
+|<img alt="image" src="https:/42Box/iOS/assets/85754295/73f09320-2d85-4ba3-a3b8-067a49a33c55">|
+|Theme and Settings|
+|<img alt="image" src="https:/42Box/iOS/assets/116494364/edda41cb-e6f9-4113-9b98-7851efe24a58">|
diff --git a/iBox/Sources/CustomLaunchScreen/CustomLaunchScreenViewController.swift b/iBox/Sources/CustomLaunchScreen/CustomLaunchScreenViewController.swift
@@ -44,7 +44,9 @@ class CustomLaunchScreenViewController: UIViewController {
  switch result {
  case .success, .maxRetryReached, .later:
  DefaultData.insertDefaultDataIfNeeded() {
- self?.transitionToNextScreen()
+ DispatchQueue.main.async {
+ self?.transitionToNextScreen()
+ }
  }
  print("App 정상 실행")
  case .urlError:

diff --git a/iBox/Sources/Extension/UIView+Extension.swift b/iBox/Sources/Extension/UIView+Extension.swift
@@ -39,16 +39,5 @@ extension UIView {
  self.layer.mask = mask
  }
  }
-
- // MARK: - 뷰 계층 구조 log
- func printViewHierarchy(level: Int = 0) {
- let padding = String(repeating: " ", count: level * 2)
- let viewInfo = "\(padding)\(type(of: self)) - Frame: \(self.frame)"
- print(viewInfo)
-
- for subview in self.subviews {
- subview.printViewHierarchy(level: level + 1)
- }
- }
-
+
 }
diff --git a/iBox/Sources/Initializer/DefaultData.swift b/iBox/Sources/Initializer/DefaultData.swift
@@ -28,7 +28,7 @@ class DefaultData {
 
  static func fetchDefaultData(completion: @escaping ([Folder]) -> Void) {
  let localDic: [String : String] = ["Seoul" : "default-kr", "default" : "default"]
- let cityName = "Seoul" // 추후 global 예정
+ let cityName = "Seoul"
  let local = localDic[cityName] ?? "default"
 
  let url = URL(string: "https://raw.githubusercontent.com/42Box/versioning/main/\(local).json")!
@@ -42,6 +42,9 @@ class DefaultData {
  do {
  let folderData = try JSONDecoder().decode(FolderData.self, from: data)
  let folders = [Folder(id: UUID(), name: "42 \(cityName)", bookmarks: folderData.list.map { Bookmark(id: UUID(), name: $0.name, url: URL(string: $0.url)!) })]
+ if let defaultURLData = URL(string: folderData.favorite) {
+ DefaultDataLoader.defaultURL = defaultURLData
+ }
  completion(folders)
  } catch {
  print("Error decoding JSON: \(error)")

diff --git a/iBox/Sources/Initializer/DefaultDataModel.swift b/iBox/Sources/Initializer/DefaultDataModel.swift
@@ -9,6 +9,7 @@ import Foundation
 
 
 struct FolderData: Codable {
+ var favorite: String
  var list: [BookmarkData]
 }
 
@@ -18,14 +19,16 @@ struct BookmarkData: Codable {
 }
 
 struct DefaultDataLoader {
+ static var defaultURL = URL(string: "https:/42Box/iOS/blob/main/HowToUse.md#-how-to-use")!
  static let defaultData = [
- Folder(id: UUID(), name: "42 폴더", bookmarks: [
- Bookmark(id: UUID(), name: "42 Intra", url: URL(string: "https://profile.intra.42.fr/")!),
- Bookmark(id: UUID(), name: "42Where", url: URL(string: "https://www.where42.kr/")! ),
- Bookmark(id: UUID(), name: "42Stat", url: URL(string: "https://stat.42seoul.kr/")!),
- Bookmark(id: UUID(), name: "집현전", url: URL(string: "https://42library.kr/")!),
- Bookmark(id: UUID(), name: "42gg", url: URL(string: "https://gg.42seoul.kr/")!),
- Bookmark(id: UUID(), name: "24HANE", url: URL(string: "https://24hoursarenotenough.42seoul.kr/")!)
+ Folder(id: UUID(), name: "42Box", bookmarks: [
+ Bookmark(id: UUID(), name: "How to use 42Box", url: URL(string: "https:/42Box/iOS/blob/main/HowToUse.md#-how-to-use")!),
+// Bookmark(id: UUID(), name: "42 Intra", url: URL(string: "https://profile.intra.42.fr/")!),
+// Bookmark(id: UUID(), name: "42Where", url: URL(string: "https://www.where42.kr/")! ),
+// Bookmark(id: UUID(), name: "42Stat", url: URL(string: "https://stat.42seoul.kr/")!),
+// Bookmark(id: UUID(), name: "집현전", url: URL(string: "https://42library.kr/")!),
+// Bookmark(id: UUID(), name: "42gg", url: URL(string: "https://gg.42seoul.kr/")!),
+// Bookmark(id: UUID(), name: "24HANE", url: URL(string: "https://24hoursarenotenough.42seoul.kr/")!)
  ])
  ]
 }
diff --git a/iBox/Sources/Shared/WebViewPreloader.swift b/iBox/Sources/Shared/WebViewPreloader.swift
@@ -11,7 +11,7 @@ import WebKit
 class WebViewPreloader {
  static let shared = WebViewPreloader()
  private var favoriteView: (url: URL, webView: WebView)?
- private var defaultUrl = URL(string: "https://profile.intra.42.fr/")!
+ private var defaultUrl = DefaultDataLoader.defaultURL
 
  private init() {}