This repository has been archived by the owner on Nov 17, 2024. It is now read-only.
Fix // fix error cause by resolve conflict & others #16
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bill-Haku
added a commit
that referenced
this pull request
May 9, 2023
* home UI & i18n (#11) * proj: add license (#8) * porj: fix compile swiftlint error * i18n: change into id * i18n: add zh-Hans texts * feat: add more view in settings * refactor: avoid force cast --------- Co-authored-by: Lava <34743145+CanglongCl@users.noreply.github.com> * Manage Account // fix add account (#10) * fix: fix add account * fix: select account when creating account * i18n: apply i18n * Daily Note // Improve UI (#12) * UI: New home page UI and new setting items (#15) * proj: add 3rd party libs info * code: fix typo * i18n: fix some missing keys * feat: add FAQ link * feat: add navi title for other settings view * i18n: fix i18n of expeditions, etc. * code: some notes format * feat: hide dispatch * feat: trailblazer ui * feat: add rate buttons in settings view --------- Co-authored-by: Bill-Haku <battleandwar@hotmail.com> * Fix // fix error cause by resolve conflict & others (#16) * fix: merge conflict bug * code: delete unused codes * code: mark TODOs * fix: replace UserDefault using SwiftyUserDefaults * fix: delete unused code * proj: apply xcode recommended setting * Daily Note // Improve refresh (#17) * Repo // Contribution Guide (#18) * repo: update readme license * repo: update readme and contribution guide * fix: spell error * repo: update issue templates (#19) * docs: add document comments (#21) * Widget // New feature (#22) * docs: add document comments * feat: add widget, intent * feat: provide accounts * refactor: re-struct the assets folder * feat: provide background * refactor: refactor some code and filename * refactor: delete not used codes * repo: edit lint profile * feat: timeline provider * feat: square widget and fix widget background * pref: improve daily note widget * feat: complete dailynote widget timeline provider * code: delete debug codes * feat: widget view * fix: widget background provider * feat: widget account name * feat: widget account card * fix: update default background * proj: add a placeholder icon for publish beta version * proj: v1.0.0-Beta.1-31 * code: resolve conflict * Revert "code: resolve conflict" This reverts commit 0a6ff9a. * fix: pbxproj error * repo: swiftlint github action repo: swiftlint github action repo: swiftlint github action repo: swiftlint github action repo: swiftlint github action repo: action add swiftlint fix: swiftlint github action repo: swiftlint github action * Widget // improve (#23) * docs: add document comments * feat: add widget, intent * feat: provide accounts * refactor: re-struct the assets folder * feat: provide background * refactor: refactor some code and filename * refactor: delete not used codes * repo: edit lint profile * feat: timeline provider * feat: square widget and fix widget background * pref: improve daily note widget * feat: complete dailynote widget timeline provider * code: delete debug codes * feat: widget view * fix: widget background provider * feat: widget account name * feat: widget account card * fix: update default background * proj: add a placeholder icon for publish beta version * proj: v1.0.0-Beta.1-31 * code: resolve conflict * Revert "code: resolve conflict" This reverts commit 0a6ff9a. * fix: pbxproj error * repo: swiftlint github action repo: swiftlint github action repo: swiftlint github action repo: swiftlint github action repo: swiftlint github action repo: action add swiftlint fix: swiftlint github action repo: swiftlint github action * refactor: widget background * fix: build * refactor: edit background folder name * docs: app config docs * Optimization // Added some system features from Genshin pizza helper (#24) * feat: add CFBundleDisplayName * fix: empty cookie line * feat: add server description * feat: add Update info and User Policy * proj: add new package * feat: add taptic * feat: add account button * code: fix conflict resolve error * code: delete unused code * refactor: wrap app init related to modifier * code: resolve conversations * docs: docs for 2 user default key * proj: update `.gitignore` ignoring `.swiftpm` * proj: update xcsheme --------- Co-authored-by: Lava <34743145+CanglongCl@users.noreply.github.com> * Widget Background // Background customizable (#25) * feat: add CFBundleDisplayName * fix: empty cookie line * feat: add server description * feat: customize widget background * feat: add Update info and User Policy * proj: add new package * feat: add taptic * fix: customize background * docs: add docs for containing widget background * feat: add account button * code: fix conflict resolve error * code: delete unused code * refactor: wrap app init related to modifier * fix: resolve conflict * feat: widget background preview * code: resolve conversations * feat: make widget card accessibility background and text color editable * docs: docs for 2 user default key * proj: update `.gitignore` ignoring `.swiftpm` * proj: update xcsheme --------- Co-authored-by: Bill-Haku <battleandwar@hotmail.com> Co-authored-by: HakuBill <i@hakubill.tech> * fix: not getting daily note after adding account (#26) * proj: v1.0.0-Beta.2-45 * fix: cannot query latest version (#27) * proj: v1.0.0-Beta.3-46 * feat: create account get account error alert * fix: global server id * fix: account server picker does not work * fix: home page daily note when error, fix the sheet poped * refactor: daily note cards * pref: daily note view show expedition if only one account as default * pref: home daily note expedition view * pref: widget intent select text color only not use accessibility background * pref: text hint for accessibility background * fix: widget time interval formatter * feat: check and reload timeline on app appear * feat: widget refresh time setting * pref: refresh frequency text * pref: setting title * pref: widget background setting title * pref: widget background setting title * pref: widget background setting title --------- Co-authored-by: HakuBill <i@hakubill.tech> Co-authored-by: Bill-Haku <battleandwar@hotmail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
others:
TODOs