Merge pull request #205 from tatsuz0u/develop

EhPanda 2.0

.github/workflows/deploy.yml

@@ -5,8 +5,8 @@ on:
       - main
     types: [closed]
 env:
-  DEVELOPER_DIR: /Applications/Xcode_13.1.app
-  APP_VERSION: '1.5.4'
+  DEVELOPER_DIR: /Applications/Xcode_13.2.1.app
+  APP_VERSION: '2.0.0'
   SCHEME_NAME: 'EhPanda'
   ALTSTORE_JSON_PATH: './AltStore.json'
   BUILDS_PATH: '/tmp/action-builds'
@@ -31,6 +31,8 @@ jobs:
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+      - name: Install dependencies
+        run: brew install rswift
       - name: Show Xcode version
         run: xcodebuild -version
       - name: Run tests

.github/workflows/test.yml

@@ -2,13 +2,15 @@ name: Test
 on: [push]
 env:
    SCHEME_NAME: 'EhPanda'
-   DEVELOPER_DIR: /Applications/Xcode_13.0.app
+   DEVELOPER_DIR: /Applications/Xcode_13.2.1.app
 jobs:
   Test:
     runs-on: macos-11
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Install dependencies
+        run: brew install rswift
       - name: Show Xcode version
         run: xcodebuild -version
       - name: Run tests

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 EhPanda.xcodeproj/xcuserdata
-EhPanda.xcodeproj/project.xcworkspace/xcuserdata
+EhPanda.xcodeproj/project.xcworkspace/xcuserdata
+EhPanda/App/R.generated.swift

.swiftlint.yml

@@ -15,3 +15,4 @@ identifier_name:
 
 excluded:
  - EhPandaTests
+ - EhPanda/App/R.generated.swift

EhPanda.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -6,17 +6,26 @@
         "repositoryURL": "https://github.com/tatsuz0u/AlertKit.git",
         "state": {
           "branch": "custom",
-          "revision": "7be1b8fe55399ddd60826b0206de1cf0bc767f6f",
+          "revision": "39b01c53ffadf3dab9871dd4c960cd81af5246b6",
           "version": null
         }
       },
       {
-        "package": "BetterCodable",
-        "repositoryURL": "https://github.com/marksands/BetterCodable.git",
+        "package": "Colorful",
+        "repositoryURL": "https://github.com/Co2333/Colorful.git",
         "state": {
           "branch": null,
-          "revision": "61153170668db7a46a20a87e35e70f80b24d4eb5",
-          "version": "0.4.0"
+          "revision": "eb5a350aec759bd413615273cb6d64553aead4d5",
+          "version": "1.0.1"
+        }
+      },
+      {
+        "package": "combine-schedulers",
+        "repositoryURL": "https://github.com/pointfreeco/combine-schedulers",
+        "state": {
+          "branch": null,
+          "revision": "4cf088c29a20f52be0f2ca54992b492c54e0076b",
+          "version": "0.5.3"
         }
       },
       {
@@ -28,6 +37,15 @@
           "version": null
         }
       },
+      {
+        "package": "FilePicker",
+        "repositoryURL": "https://github.com/markrenaud/FilePicker.git",
+        "state": {
+          "branch": null,
+          "revision": "720f8cb5ca0c0efc982ed381afc84ba3e8b3214e",
+          "version": "1.0.1"
+        }
+      },
       {
         "package": "Kanna",
         "repositoryURL": "https://github.com/tid-kijyun/Kanna.git",
@@ -41,11 +59,83 @@
         "package": "Kingfisher",
         "repositoryURL": "https://github.com/onevcat/Kingfisher.git",
         "state": {
-          "branch": "master",
-          "revision": "c874e5ef178a65b6a2b6a04d5981652d4fa95e22",
+          "branch": null,
+          "revision": "0c02c46cfdc0656ce74fd0963a75e5000a0b7f23",
+          "version": "7.1.2"
+        }
+      },
+      {
+        "package": "R.swift.Library",
+        "repositoryURL": "https://github.com/mac-cain13/R.swift.Library.git",
+        "state": {
+          "branch": null,
+          "revision": "8998cfe77f4fce79ee6dfab0c88a7d551659d8fb",
+          "version": "5.4.0"
+        }
+      },
+      {
+        "package": "SFSafeSymbols",
+        "repositoryURL": "https://github.com/SFSafeSymbols/SFSafeSymbols.git",
+        "state": {
+          "branch": "stable",
+          "revision": "846e558cda47e1a2d2cea988a9c18378f830bddf",
           "version": null
         }
       },
+      {
+        "package": "swift-case-paths",
+        "repositoryURL": "https://github.com/pointfreeco/swift-case-paths",
+        "state": {
+          "branch": null,
+          "revision": "241301b67d8551c26d8f09bd2c0e52cc49f18007",
+          "version": "0.8.0"
+        }
+      },
+      {
+        "package": "swift-collections",
+        "repositoryURL": "https://github.com/apple/swift-collections",
+        "state": {
+          "branch": null,
+          "revision": "48254824bb4248676bf7ce56014ff57b142b77eb",
+          "version": "1.0.2"
+        }
+      },
+      {
+        "package": "swift-composable-architecture",
+        "repositoryURL": "https://github.com/pointfreeco/swift-composable-architecture.git",
+        "state": {
+          "branch": null,
+          "revision": "ba9c626ab1b2b6af8cf684eebb2ab472fa5b6753",
+          "version": "0.33.1"
+        }
+      },
+      {
+        "package": "swift-custom-dump",
+        "repositoryURL": "https://github.com/pointfreeco/swift-custom-dump",
+        "state": {
+          "branch": null,
+          "revision": "51698ece74ecf31959d3fa81733f0a5363ef1b4e",
+          "version": "0.3.0"
+        }
+      },
+      {
+        "package": "swift-identified-collections",
+        "repositoryURL": "https://github.com/pointfreeco/swift-identified-collections",
+        "state": {
+          "branch": null,
+          "revision": "680bf440178a78a627b1c2c64c0855f6523ad5b9",
+          "version": "0.3.2"
+        }
+      },
+      {
+        "package": "swiftui-navigation",
+        "repositoryURL": "https://github.com/pointfreeco/swiftui-navigation.git",
+        "state": {
+          "branch": null,
+          "revision": "2694c03284a368168b3e0b8d7ab52626802d2246",
+          "version": "0.1.0"
+        }
+      },
       {
         "package": "SwiftUIPager",
         "repositoryURL": "https://github.com/fermoya/SwiftUIPager.git",
@@ -82,6 +172,15 @@
           "version": null
         }
       },
+      {
+        "package": "UIImageColors",
+        "repositoryURL": "https://github.com/jathu/UIImageColors.git",
+        "state": {
+          "branch": null,
+          "revision": "e49e6c32ea556e9fa0109dc79686bea4a10d41a2",
+          "version": "2.2.0"
+        }
+      },
       {
         "package": "WaterfallGrid",
         "repositoryURL": "https://github.com/paololeonardi/WaterfallGrid.git",
@@ -90,6 +189,15 @@
           "revision": "944aa82832ed5a9eaaf50862cdd53e3c10ab55eb",
           "version": "1.0.1"
         }
+      },
+      {
+        "package": "xctest-dynamic-overlay",
+        "repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay",
+        "state": {
+          "branch": null,
+          "revision": "50a70a9d3583fe228ce672e8923010c8df2deddd",
+          "version": "0.2.1"
+        }
       }
     ]
   },

EhPanda/App/Constant.strings

@@ -0,0 +1,88 @@
+/* 
+  Constant.strings
+  EhPanda
+
+  Created by 荒木辰造 on R 4/02/04.
+
+*/
+
+// MARK: Website response
+"website.response.hathClientNotFound" = "You must have a H@H client assigned to your account to use this feature.";
+"website.response.hathClientNotOnline" = "Your H@H client appears to be offline. Turn it on, then try again.";
+"website.response.invalidResolution" = "The requested gallery cannot be downloaded with the selected resolution.";
+"website.response.galleryUnavailable" = "This gallery has been removed or is unavailable.";
+
+// MARK: EhPanda
+"ehpanda.copyright" = "Copyright © 2022 荒木辰造";
+
+// Contacts
+"ehpanda.contacts.link.website" = "https://ehpanda.app";
+"ehpanda.contacts.link.gitHub" = "https://github.com/tatsuz0u/EhPanda";
+"ehpanda.contacts.link.discord" = "https://discord.gg/BSBE9FCBTq";
+"ehpanda.contacts.link.telegram" = "https://t.me/ehpanda";
+"ehpanda.contacts.link.altStore" = "altstore://source?url=https://github.com/tatsuz0u/EhPanda/raw/main/AltStore.json";
+"ehpanda.contacts.text.gitHub" = "GitHub";
+"ehpanda.contacts.text.discord" = "Discord";
+"ehpanda.contacts.text.telegram" = "Telegram";
+
+// Special thanks
+"ehpanda.special.thanks.link.taylorlannister" = "https://github.com/taylorlannister";
+"ehpanda.special.thanks.link.Luminescent_yq" = "";
+"ehpanda.special.thanks.link.caxerx" = "https://github.com/caxerx";
+"ehpanda.special.thanks.link.honjow" = "https://github.com/honjow";
+"ehpanda.special.thanks.text.taylorlannister" = "taylorlannister";
+"ehpanda.special.thanks.text.Luminescent_yq" = "Luminescent_yq";
+"ehpanda.special.thanks.text.caxerx" = "caxerx";
+"ehpanda.special.thanks.text.honjow" = "honjow";
+
+// Code level contributors
+"ehpanda.code.level.contributors.link.tatsuz0u" = "https://github.com/tatsuz0u";
+"ehpanda.code.level.contributors.link.leng-yue" = "https://github.com/leng-yue";
+"ehpanda.code.level.contributors.text.tatsuz0u" = "Tatsuzou Araki";
+"ehpanda.code.level.contributors.text.leng-yue" = "LengYue";
+
+// Translation contributors
+"ehpanda.translation.contributors.link.tatsuz0u" = "https://github.com/tatsuz0u";
+"ehpanda.translation.contributors.link.PaulHaeussler" = "https://github.com/PaulHaeussler";
+"ehpanda.translation.contributors.link.caxerx" = "https://github.com/caxerx";
+"ehpanda.translation.contributors.link.nyaanim" = "https://github.com/nyaanim";
+"ehpanda.translation.contributors.text.tatsuz0u" = "Tatsuzou Araki";
+"ehpanda.translation.contributors.text.PaulHaeussler" = "PaulHaeussler";
+"ehpanda.translation.contributors.text.caxerx" = "caxerx";
+"ehpanda.translation.contributors.text.nyaanim" = "nyaanim";
+
+// Acknowledgements links
+"ehpanda.acknowledgements.link.kanna" = "https://github.com/tid-kijyun/Kanna";
+"ehpanda.acknowledgements.link.rswift" = "https://github.com/mac-cain13/R.swift";
+"ehpanda.acknowledgements.link.alertKit" = "https://github.com/rebeloper/AlertKit";
+"ehpanda.acknowledgements.link.colorful" = "https://github.com/Co2333/Colorful";
+"ehpanda.acknowledgements.link.filePicker" = "https://github.com/markrenaud/FilePicker";
+"ehpanda.acknowledgements.link.kingfisher" = "https://github.com/onevcat/Kingfisher";
+"ehpanda.acknowledgements.link.swiftUIPager" = "https://github.com/fermoya/SwiftUIPager";
+"ehpanda.acknowledgements.link.swiftyBeaver" = "https://github.com/SwiftyBeaver/SwiftyBeaver";
+"ehpanda.acknowledgements.link.waterfallGrid" = "https://github.com/paololeonardi/WaterfallGrid";
+"ehpanda.acknowledgements.link.swiftyOpenCC" = "https://github.com/ddddxxx/SwiftyOpenCC";
+"ehpanda.acknowledgements.link.UIImageColors" = "https://github.com/jathu/UIImageColors";
+"ehpanda.acknowledgements.link.SFSafeSymbols" = "https://github.com/SFSafeSymbols/SFSafeSymbols";
+"ehpanda.acknowledgements.link.TTProgressHUD" = "https://github.com/honkmaster/TTProgressHUD";
+"ehpanda.acknowledgements.link.swiftUINavigation" = "https://github.com/pointfreeco/swiftui-navigation";
+"ehpanda.acknowledgements.link.ehTagTranslationDatabase" = "https://github.com/EhTagTranslation/Database";
+"ehpanda.acknowledgements.link.TCA" = "https://github.com/pointfreeco/swift-composable-architecture";
+
+// Acknowledgements texts
+"ehpanda.acknowledgements.text.kanna" = "Kanna";
+"ehpanda.acknowledgements.text.rswift" = "R.swift";
+"ehpanda.acknowledgements.text.alertKit" = "AlertKit";
+"ehpanda.acknowledgements.text.colorful" = "Colorful";
+"ehpanda.acknowledgements.text.filePicker" = "FilePicker";
+"ehpanda.acknowledgements.text.kingfisher" = "Kingfisher";
+"ehpanda.acknowledgements.text.swiftUIPager" = "SwiftUIPager";
+"ehpanda.acknowledgements.text.swiftyBeaver" = "SwiftyBeaver";
+"ehpanda.acknowledgements.text.waterfallGrid" = "WaterfallGrid";
+"ehpanda.acknowledgements.text.swiftyOpenCC" = "SwiftyOpenCC";
+"ehpanda.acknowledgements.text.UIImageColors" = "UIImageColors";
+"ehpanda.acknowledgements.text.SFSafeSymbols" = "SFSafeSymbols";
+"ehpanda.acknowledgements.text.TTProgressHUD" = "TTProgressHUD";
+"ehpanda.acknowledgements.text.swiftUINavigation" = "SwiftUI Navigation";
+"ehpanda.acknowledgements.text.ehTagTranslationDatabase" = "EhTagTranslation/Database";
+"ehpanda.acknowledgements.text.TCA" = "The Composable Architecture";