search

kiwix / kiwix-apple

Kiwix for offline access on iOS and macOS
https://apple.kiwix.org
GNU Lesser General Public License v3.0
434 stars 69 forks source link

Add support link item in side bar #705

Closed DobleV55 closed 1 month ago

DobleV55 commented 1 month ago

Fixes #660

DobleV55 commented 1 month ago

Hi @BPerlakiH , I've completed the rebase process on the main branch with the 660-add-support... branch to incorporate the latest changes. Here are the steps I took:

  1. Checked out the main branch and pulled the latest changes: git checkout main && git pull
  2. Rebased the main branch with the 660-add-support... branch: git rebase 660-add-support...
  3. Checked out the 660-add-support... branch and pulled any changes: git checkout 660-add-support... && git pull The output from the git pull command on the 660-add-support... branch indicates a successful fast-forward merge with no conflicts: 
    Updating 1fbc4be3..4c6206d0
Fast-forward
App/App_macOS.swift                  | 2 +-
Support/en.lproj/Localizable.strings | 2 +-
SwiftUI/Patches.swift                | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
Generate project files for Xcode.........................................Passed

    Since no conflicts were encountered during the rebase process and the fast-forward merge was successful, there are no additional steps required. Finally, after pushing the changes, Git confirms that everything is up to date.

Should I proceed with any additional steps?

PD: The update URL commit contains the changes related to the URL discussion.

kelson42 commented 1 month ago

This PR is not ready and does not really do what is requested, see my comment done a month ago. Make this code generic, and create a PR at kiwix/apple-custom-apps to add this link for the DWDS app, exactly like on the Android custom app.

DobleV55 commented 1 month ago

Hi @kelson42 , I added the support Kiwix button that opens in a separate browser in both the Kiwix desktop app and the iOS mobile version. If this isn't satisfactory for you, please reassign the ticket, and let someone else handle it.

kelson42 commented 1 month ago

@BPerlakiH I guess you will have to finish this PR :(

BPerlakiH commented 1 month ago

@kelson42 I've updated it with a branding solution similar to Android.

kelson42 commented 1 month ago

@BPerlakiH Can you please implement this with a PR for DWDS like on Android, to secure it works?

BPerlakiH commented 1 month ago

@kelson42 I've updated this to be the same as on Android. I've also opened a PR under custom apps, to parse and document the new (optional) property: https://github.com/kiwix/kiwix-apple-custom/pull/62