Merge pull request #397 from rebelonion/dev

Dev
2024-05-23 13:24:09 -05:00 · 2024-05-23 13:24:09 -05:00 · e7cf0f7b03
commit e7cf0f7b03
parent b5b7dac247 560eef491f
500 changed files with 26609 additions and 13685 deletions
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@ -48,9 +48,11 @@ jobs:
        echo "COMMIT_LOG=${COMMIT_LOGS}" >> $GITHUB_ENV
        # Debugging: Print the variable to check its content
        echo "$COMMIT_LOGS"
        echo "$COMMIT_LOGS" > commit_log.txt
      shell: /usr/bin/bash -e {0}
      env:
        CI: true
      continue-on-error: true
    - name: Save Current SHA for Next Run
      run: echo ${{ github.sha }} > last_sha.txt
@ -82,13 +84,13 @@ jobs:
    - name: Build with Gradle
      run: ./gradlew assembleGoogleAlpha -Pandroid.injected.signing.store.file=$GITHUB_WORKSPACE/key.keystore -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }}
-    - name: Upload Build Artifacts
+    - name: Upload a Build Artifact
-      uses: actions/upload-artifact@v4.3.1
+      uses: actions/upload-artifact@v4
      with:
-          name: APKs
+          name: Dantotsu
-          path: |
+          retention-days: 5
-            app/build/outputs/apk/google/alpha/*/*.apk
+          compression-level: 9
-            app/build/outputs/apk/google/alpha/*/*/*.apk
+          path: "app/build/outputs/apk/google/alpha/app-google-alpha.apk"
    - name: Upload APK to Discord and Telegram
      if: ${{ github.repository == 'rebelonion/Dantotsu' }}
@ -102,7 +104,7 @@ jobs:
          commit_messages="${commit_messages:0:$max_length}... (truncated)"
        fi
        contentbody=$( jq -nc --arg msg "Alpha-Build: <@&1225347048321191996> **$VERSION**:" --arg commits "$commit_messages" '{"content": ($msg + "\n" + $commits)}' )
-        curl -F "payload_json=${contentbody}" -F "dantotsu_debug=@app/build/outputs/apk/google/alpha/app-google-universal-alpha.apk" ${{ secrets.DISCORD_WEBHOOK }}
+        curl -F "payload_json=${contentbody}" -F "dantotsu_debug=@app/build/outputs/apk/google/alpha/app-google-alpha.apk" ${{ secrets.DISCORD_WEBHOOK }}
        #Telegram
        curl -F "chat_id=${{ secrets.TELEGRAM_CHANNEL_ID }}" \
@ -115,18 +117,13 @@ jobs:
        VERSION: ${{ env.VERSION }}
    - name: Upload Current SHA as Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
      with:
        name: last-sha
        path: last_sha.txt
-
+    - name: Upload Commit log as Artifact
-    - name: Delete Old Pre-Releases
+      uses: actions/upload-artifact@v4
      id: delete-pre-releases
      uses: sgpublic/delete-release-action@master
      with:
-        pre-release-drop: true
+        name: commit-log
-        pre-release-keep-count: 3
+        path: commit_log.txt
        pre-release-drop-tag: true
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@ -31,3 +31,6 @@ output.json
 #other
 scripts/
 #crowdin
 crowdin.yml
--- a/LICENSE.md
+++ b/LICENSE.md
@ -1,674 +1,17 @@
-                    GNU GENERAL PUBLIC LICENSE
+## Unabandon Public License (UPL)
                       Version 3, 29 June 2007
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+**Preamble**
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
-                            Preamble
+This Unabandon Public License (UPL) is designed to ensure the continued development and public availability of source code based on works released under the GNU General Public License Version 3 (GPLv3) while upholding the core principles of GPLv3. This license extends GPLv3 by mandating public accessibility of source code for any derivative works.
-  The GNU General Public License is a free, copyleft license for
+**Body**
 software and other kinds of works.
-  The licenses for most software and other practical works are designed
+1. **Incorporation of GPLv3:** This UPL incorporates all terms and conditions of the GNU General Public License Version 3 (GPLv3) as published by the Free Software Foundation. You can find the complete text of GPLv3 at [https://www.gnu.org/licenses/licenses.en.html](https://www.gnu.org/licenses/licenses.en.html).
 to take away your freedom to share and change the works.  By contrast,
 the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
 software for all its users.  We, the Free Software Foundation, use the
 GNU General Public License for most of our software; it applies also to
 any other work released this way by its authors.  You can apply it to
 your programs, too.
-  When we speak of free software, we are referring to freedom, not
+2. **Public Source Requirement:** In addition to the terms of GPLv3, the source code for any software distributed under this license, including modifications and derivative works, must be publicly available. Public availability means the source code must be accessible to anyone through a publicly accessible repository or download link without any access restrictions or fees.
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
-  To protect your rights, we need to prevent others from denying you
+3. **Source Code Availability:** The source code must be made publicly available using a recognized open-source hosting platform (e.g., GitHub, GitLab) or be downloadable from a publicly accessible website. The chosen method must clearly identify the source code and its corresponding licensed work.
 these rights or asking you to surrender the rights.  Therefore, you have
 certain responsibilities if you distribute copies of the software, or if
 you modify it: responsibilities to respect the freedom of others.
-  For example, if you distribute copies of such a program, whether
+**Termination**
 gratis or for a fee, you must pass on to the recipients the same
 freedoms that you received.  You must make sure that they, too, receive
 or can get the source code.  And you must show them these terms so they
 know their rights.
-  Developers that use the GNU GPL protect your rights with two steps:
+This UPL terminates automatically if the terms and conditions are not followed by the licensee.
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.
  For the developers' and authors' protection, the GPL clearly explains
 that there is no warranty for this free software.  For both users' and
 authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.
  Some devices are designed to deny users access to install or run
 modified versions of the software inside them, although the manufacturer
 can do so.  This is fundamentally incompatible with the aim of
 protecting users' freedom to change the software.  The systematic
 pattern of such abuse occurs in the area of products for individuals to
 use, which is precisely where it is most unacceptable.  Therefore, we
 have designed this version of the GPL to prohibit the practice for those
 products.  If such problems arise substantially in other domains, we
 stand ready to extend this provision to those domains in future versions
 of the GPL, as needed to protect the freedom of users.
  Finally, every program is threatened constantly by software patents.
 States should not allow patents to restrict development and use of
 software on general-purpose computers, but in those that do, we wish to
 avoid the special danger that patents applied to a free program could
 make it effectively proprietary.  To prevent this, the GPL assures that
 patents cannot be used to render the program non-free.
  The precise terms and conditions for copying, distribution and
 modification follow.
                       TERMS AND CONDITIONS
  0. Definitions.
  "This License" refers to version 3 of the GNU General Public License.
  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
  "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
  To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
 exact copy.  The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.
  A "covered work" means either the unmodified Program or a work based
 on the Program.
  To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
 computer or modifying a private copy.  Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.
  To "convey" a work means any kind of propagation that enables other
 parties to make or receive copies.  Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.
  An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
 work under this License, and how to view a copy of this License.  If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.
  1. Source Code.
  The "source code" for a work means the preferred form of the work
 for making modifications to it.  "Object code" means any non-source
 form of a work.
  A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.
  The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
 implementation is available to the public in source code form.  A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.
  The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
 control those activities.  However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
 which are not part of the work.  For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.
  The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.
  The Corresponding Source for a work in source code form is that
 same work.
  2. Basic Permissions.
  All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
 conditions are met.  This License explicitly affirms your unlimited
 permission to run the unmodified Program.  The output from running a
 covered work is covered by this License only if the output, given its
 content, constitutes a covered work.  This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.
  You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
 in force.  You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
 not control copyright.  Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.
  Conveying under any other circumstances is permitted solely under
 the conditions stated below.  Sublicensing is not allowed; section 10
 makes it unnecessary.
  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
  No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.
  When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
 modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.
  4. Conveying Verbatim Copies.
  You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
 non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
  You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
  5. Conveying Modified Source Versions.
  You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
    a) The work must carry prominent notices stating that you modified
    it, and giving a relevant date.
    b) The work must carry prominent notices stating that it is
    released under this License and any conditions added under section
    7.  This requirement modifies the requirement in section 4 to
    "keep intact all notices".
    c) You must license the entire work, as a whole, under this
    License to anyone who comes into possession of a copy.  This
    License will therefore apply, along with any applicable section 7
    additional terms, to the whole of the work, and all its parts,
    regardless of how they are packaged.  This License gives no
    permission to license the work in any other way, but it does not
    invalidate such permission if you have separately received it.
    d) If the work has interactive user interfaces, each must display
    Appropriate Legal Notices; however, if the Program has interactive
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.
  A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
 beyond what the individual works permit.  Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
  6. Conveying Non-Source Forms.
  You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
    a) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by the
    Corresponding Source fixed on a durable physical medium
    customarily used for software interchange.
    b) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by a
    written offer, valid for at least three years and valid for as
    long as you offer spare parts or customer support for that product
    model, to give anyone who possesses the object code either (1) a
    copy of the Corresponding Source for all the software in the
    product that is covered by this License, on a durable physical
    medium customarily used for software interchange, for a price no
    more than your reasonable cost of physically performing this
    conveying of source, or (2) access to copy the
    Corresponding Source from a network server at no charge.
    c) Convey individual copies of the object code with a copy of the
    written offer to provide the Corresponding Source.  This
    alternative is allowed only occasionally and noncommercially, and
    only if you received the object code with such an offer, in accord
    with subsection 6b.
    d) Convey the object code by offering access from a designated
    place (gratis or for a charge), and offer equivalent access to the
    Corresponding Source in the same way through the same place at no
    further charge.  You need not require recipients to copy the
    Corresponding Source along with the object code.  If the place to
    copy the object code is a network server, the Corresponding Source
    may be on a different server (operated by you or a third party)
    that supports equivalent copying facilities, provided you maintain
    clear directions next to the object code saying where to find the
    Corresponding Source.  Regardless of what server hosts the
    Corresponding Source, you remain obligated to ensure that it is
    available for as long as needed to satisfy these requirements.
    e) Convey the object code using peer-to-peer transmission, provided
    you inform other peers where the object code and Corresponding
    Source of the work are being offered to the general public at no
    charge under subsection 6d.
  A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
  A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
 into a dwelling.  In determining whether a product is a consumer product,
 doubtful cases shall be resolved in favor of coverage.  For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
 actually uses, or expects or is expected to use, the product.  A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.
  "Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
 a modified version of its Corresponding Source.  The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.
  If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
 by the Installation Information.  But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).
  The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
 the User Product in which it has been modified or installed.  Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.
  Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.
  7. Additional Terms.
  "Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
 that they are valid under applicable law.  If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
  When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
 it.  (Additional permissions may be written to require their own
 removal in certain cases when you modify the work.)  You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.
  Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
    a) Disclaiming warranty or limiting liability differently from the
    terms of sections 15 and 16 of this License; or
    b) Requiring preservation of specified reasonable legal notices or
    author attributions in that material or in the Appropriate Legal
    Notices displayed by works containing it; or
    c) Prohibiting misrepresentation of the origin of that material, or
    requiring that modified versions of such material be marked in
    reasonable ways as different from the original version; or
    d) Limiting the use for publicity purposes of names of licensors or
    authors of the material; or
    e) Declining to grant rights under trademark law for use of some
    trade names, trademarks, or service marks; or
    f) Requiring indemnification of licensors and authors of that
    material by anyone who conveys the material (or modified versions of
    it) with contractual assumptions of liability to the recipient, for
    any liability that these contractual assumptions directly impose on
    those licensors and authors.
  All other non-permissive additional terms are considered "further
 restrictions" within the meaning of section 10.  If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
 restriction, you may remove that term.  If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
  If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.
  Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
  8. Termination.
  You may not propagate or modify a covered work except as expressly
 provided under this License.  Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).
  However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.
  Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.
  Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
 this License.  If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.
  9. Acceptance Not Required for Having Copies.
  You are not required to accept this License in order to receive or
 run a copy of the Program.  Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
 to receive a copy likewise does not require acceptance.  However,
 nothing other than this License grants you permission to propagate or
 modify any covered work.  These actions infringe copyright if you do
 not accept this License.  Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
  10. Automatic Licensing of Downstream Recipients.
  Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
 propagate that work, subject to this License.  You are not responsible
 for enforcing compliance by third parties with this License.
  An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
 organization, or merging organizations.  If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
 give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.
  You may not impose any further restrictions on the exercise of the
 rights granted or affirmed under this License.  For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
  11. Patents.
  A "contributor" is a copyright holder who authorizes use under this
 License of the Program or a work on which the Program is based.  The
 work thus licensed is called the contributor's "contributor version".
  A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
 consequence of further modification of the contributor version.  For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.
  Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
  In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
 sue for patent infringement).  To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.
  If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
 then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
 license to downstream recipients.  "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
  If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
 or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
  A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
 specifically granted under this License.  You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
 the work, and under which the third party grants, to any of the
 parties who would receive the covered work from you, a discriminatory
 patent license (a) in connection with copies of the covered work
 conveyed by you (or copies made from those copies), or (b) primarily
 for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
  Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
  12. No Surrender of Others' Freedom.
  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
 not convey it at all.  For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
  13. Use with the GNU Affero General Public License.
  Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU Affero General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
 but the special requirements of the GNU Affero General Public License,
 section 13, concerning interaction through a network will apply to the
 combination as such.
  14. Revised Versions of this License.
  The Free Software Foundation may publish revised and/or new versions of
 the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
  Each version is given a distinguishing version number.  If the
 Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
 GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.
  If the Program specifies that a proxy can decide which future
 versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
  Later license versions may give you additional or different
 permissions.  However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.
  15. Disclaimer of Warranty.
  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
 IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  16. Limitation of Liability.
  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
 USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
 DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
 PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
  17. Interpretation of Sections 15 and 16.
  If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
                     END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
  If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
    <program>  Copyright (C) <year>  <name of author>
    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
 The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License.  Of course, your program's commands
 might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
 <https://www.gnu.org/licenses/>.
  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/app/build.gradle
+++ b/app/build.gradle
@ -6,6 +6,10 @@ plugins {
    id 'com.google.devtools.ksp'
 }
 def gitCommitHash = providers.exec {
    commandLine("git", "rev-parse", "--verify", "--short", "HEAD")
 }.standardOutput.asText.get().trim()
 android {
    compileSdk 34
@ -14,9 +18,10 @@ android {
        minSdk 21
        targetSdk 34
        versionCode((System.currentTimeMillis() / 60000).toInteger())
-        versionName "3.0.0"
+        versionName "3.1.0"
-        versionCode 300000000
+        versionCode 300100000
        signingConfig signingConfigs.debug
    }
    flavorDimensions += "store"
@ -38,7 +43,7 @@ android {
    buildTypes {
        alpha {
            applicationIdSuffix ".beta" // keep as beta by popular request
-            versionNameSuffix "-alpha01"
+            versionNameSuffix "-alpha01-" + gitCommitHash
            manifestPlaceholders.icon_placeholder = "@mipmap/ic_launcher_alpha"
            manifestPlaceholders.icon_placeholder_round = "@mipmap/ic_launcher_alpha_round"
            debuggable System.getenv("CI") == null
@ -75,14 +80,14 @@ android {
 dependencies {
-    //    FireBase
+//  FireBase
-    googleImplementation platform('com.google.firebase:firebase-bom:32.7.4')
+    googleImplementation platform('com.google.firebase:firebase-bom:33.0.0')
-    googleImplementation 'com.google.firebase:firebase-analytics-ktx:21.5.1'
+    googleImplementation 'com.google.firebase:firebase-analytics-ktx:22.0.0'
-    googleImplementation 'com.google.firebase:firebase-crashlytics-ktx:18.6.2'
+    googleImplementation 'com.google.firebase:firebase-crashlytics-ktx:19.0.0'
 //  Core
    implementation 'androidx.appcompat:appcompat:1.6.1'
    implementation 'androidx.browser:browser:1.8.0'
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.core:core-ktx:1.13.1'
    implementation 'androidx.fragment:fragment-ktx:1.6.2'
    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@ -94,7 +99,8 @@ dependencies {
    implementation 'com.github.Blatzar:NiceHttp:0.4.4'
    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3'
    implementation 'androidx.preference:preference-ktx:1.2.1'
-    implementation 'androidx.webkit:webkit:1.10.0'
+    implementation 'androidx.webkit:webkit:1.11.0'
    implementation "com.anggrayudi:storage:1.5.5"
 //  Glide
    ext.glide_version = '4.16.0'
@ -105,30 +111,29 @@ dependencies {
    implementation 'jp.wasabeef:glide-transformations:4.3.0'
 //  Exoplayer
-    ext.exo_version = '1.3.0'
+    ext.exo_version = '1.3.1'
    implementation "androidx.media3:media3-exoplayer:$exo_version"
    implementation "androidx.media3:media3-ui:$exo_version"
    implementation "androidx.media3:media3-exoplayer-hls:$exo_version"
    implementation "androidx.media3:media3-exoplayer-dash:$exo_version"
    implementation "androidx.media3:media3-datasource-okhttp:$exo_version"
    implementation "androidx.media3:media3-session:$exo_version"
-    //media3 casting
+//  Media3 Casting
    implementation "androidx.media3:media3-cast:$exo_version"
-    implementation "androidx.mediarouter:mediarouter:1.6.0"
+    implementation "androidx.mediarouter:mediarouter:1.7.0"
 //  UI
-    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'com.google.android.material:material:1.12.0'
-    //implementation 'nl.joery.animatedbottombar:library:1.1.0'
+    implementation 'com.github.RepoDevil:AnimatedBottomBar:7fcb9af'
    implementation 'com.github.rebelonion:AnimatedBottomBar:v1.1.0'
    implementation 'com.flaviofaria:kenburnsview:1.0.7'
    implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
    implementation 'com.alexvasilkov:gesture-views:2.8.3'
    implementation 'com.github.VipulOG:ebook-reader:0.1.6'
    implementation 'androidx.paging:paging-runtime-ktx:3.2.1'
    implementation 'com.github.eltos:simpledialogfragments:v3.7'
-    implementation 'com.github.AAChartModel:AAChartCore-Kotlin:93972bc'
+    implementation 'com.github.AAChartModel:AAChartCore-Kotlin:7.2.1'
-    //   Markwon
+//  Markwon
    ext.markwon_version = '4.6.2'
    implementation "io.noties.markwon:core:$markwon_version"
    implementation "io.noties.markwon:editor:$markwon_version"
@ -143,7 +148,7 @@ dependencies {
    implementation "com.github.lisawray.groupie:groupie:$groupie_version"
    implementation "com.github.lisawray.groupie:groupie-viewbinding:$groupie_version"
-//    string matching
+//  String Matching
    implementation 'me.xdrop:fuzzywuzzy:1.4.0'
 //  Aniyomi
--- a/app/src/google/java/ani/dantotsu/connections/crashlytics/FirebaseCrashlytics.kt
+++ b/app/src/google/java/ani/dantotsu/connections/crashlytics/FirebaseCrashlytics.kt
@ -5,12 +5,12 @@ import com.google.firebase.FirebaseApp
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.ktx.app
 class FirebaseCrashlytics : CrashlyticsInterface {
    override fun initialize(context: Context) {
        FirebaseApp.initializeApp(context)
    }
    override fun logException(e: Throwable) {
        FirebaseCrashlytics.getInstance().recordException(e)
    }
--- a/app/src/google/java/ani/dantotsu/others/AppUpdater.kt
+++ b/app/src/google/java/ani/dantotsu/others/AppUpdater.kt
@ -85,10 +85,15 @@ object AppUpdater {
                    setPositiveButton(currContext()!!.getString(R.string.lets_go)) {
                        MainScope().launch(Dispatchers.IO) {
                            try {
                                val apks =
                                    client.get("https://api.github.com/repos/$repo/releases/tags/v$version")
-                                    .parsed<GithubResponse>().assets?.find {
+                                        .parsed<GithubResponse>().assets?.filter {
-                                        it.browserDownloadURL.endsWith("apk")
+                                            it.browserDownloadURL.endsWith(
-                                    }?.browserDownloadURL.apply {
+                                                ".apk"
                                            )
                                        }
                                val apkToDownload = apks?.first()
                                apkToDownload?.browserDownloadURL.apply {
                                    if (this != null) activity.downloadUpdate(version, this)
                                    else openLinkInBrowser("https://github.com/repos/$repo/releases/tag/v$version")
                                }
@ -111,10 +116,10 @@ object AppUpdater {
    }
    private fun compareVersion(version: String): Boolean {
-
+        return when (BuildConfig.BUILD_TYPE) {
-        if (BuildConfig.DEBUG) {
+            "debug" -> BuildConfig.VERSION_NAME != version
-            return BuildConfig.VERSION_NAME != version
+            "alpha" -> false
-        } else {
+            else -> {
                fun toDouble(list: List<String>): Double {
                    return list.mapIndexed { i: Int, s: String ->
                        when (i) {
@ -128,7 +133,8 @@ object AppUpdater {
                val new = toDouble(version.split("."))
                val curr = toDouble(BuildConfig.VERSION_NAME.split("."))
-            return new > curr
+                new > curr
            }
        }
    }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">
    <uses-sdk tools:overrideLibrary="go.server.gojni" />
    <uses-feature
        android:name="android.software.leanback"
        android:required="false" />
@ -19,7 +21,7 @@
    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
    <uses-permission
        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
+        android:maxSdkVersion="29" />
    <uses-permission
        android:name="android.permission.READ_EXTERNAL_STORAGE"
        android:maxSdkVersion="32" /> <!-- For background jobs -->
@ -38,6 +40,17 @@
        android:name="android.permission.READ_APP_SPECIFIC_LOCALES"
        tools:ignore="ProtectedPermissions" />
    <!-- ExoPlayer: Bluetooth Headsets -->
    <uses-feature
        android:name="android.hardware.bluetooth"
        android:required="false" />
    <uses-permission
        android:name="android.permission.BLUETOOTH"
        android:maxSdkVersion="30" />
    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
    <!-- ExoPlayer: Bluetooth Headsets -->
    <queries>
        <package android:name="idm.internet.download.manager.plus" />
        <package android:name="idm.internet.download.manager" />
@ -49,6 +62,7 @@
        android:name=".App"
        android:allowBackup="true"
        android:banner="@mipmap/ic_banner_foreground"
        android:enableOnBackInvokedCallback="true"
        android:icon="${icon_placeholder}"
        android:label="@string/app_name"
        android:largeHeap="true"
@ -57,9 +71,30 @@
        android:supportsRtl="true"
        android:theme="@style/Theme.Dantotsu"
        android:usesCleartextTraffic="true"
-        tools:ignore="AllowBackup">
+        tools:ignore="AllowBackup"
        tools:targetApi="tiramisu">
        <receiver
-            android:name=".widgets.CurrentlyAiringWidget"
+            android:name=".widgets.upcoming.UpcomingWidget"
            android:exported="true">
            <intent-filter>
                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
            </intent-filter>
            <meta-data
                android:name="android.appwidget.provider"
                android:resource="@xml/upcoming_widget_info" />
        </receiver>
        <activity
            android:name=".widgets.upcoming.UpcomingWidgetConfigure"
            android:exported="true">
            <intent-filter>
                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
            </intent-filter>
        </activity>
        <receiver
            android:name=".widgets.statistics.ProfileStatsWidget"
            android:exported="false">
            <intent-filter>
                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@ -67,11 +102,10 @@
            <meta-data
                android:name="android.appwidget.provider"
-                android:resource="@xml/currently_airing_widget_info" />
+                android:resource="@xml/statistics_widget_info" />
        </receiver>
        <receiver android:name=".notifications.IncognitoNotificationClickReceiver" />
        <activity
            android:name=".media.novel.novelreader.NovelReaderActivity"
            android:configChanges="orientation|screenSize"
@ -95,6 +129,8 @@
                <data android:scheme="file" />
            </intent-filter>
        </activity>
        <activity android:name=".others.calc.CalcActivity"
            android:parentActivityName=".MainActivity" />
        <activity android:name=".settings.FAQActivity" />
        <activity android:name=".settings.ReaderSettingsActivity" />
        <activity android:name=".settings.UserInterfaceSettingsActivity" />
@ -103,30 +139,76 @@
            android:name=".settings.SettingsActivity"
            android:parentActivityName=".MainActivity" />
        <activity
-            android:name=".settings.ExtensionsActivity"
+            android:name=".settings.SettingsAboutActivity"
            android:windowSoftInputMode="adjustResize|stateHidden"
            android:parentActivityName=".MainActivity" />
        <activity
            android:name=".home.status.StatusActivity"
            android:parentActivityName=".MainActivity" />
        <activity
            android:name=".settings.SettingsAccountActivity"
            android:parentActivityName=".MainActivity" />
        <activity
            android:name=".settings.SettingsAnimeActivity"
            android:parentActivityName=".MainActivity" />
        <activity
            android:name=".settings.SettingsCommonActivity"
            android:parentActivityName=".MainActivity" />
        <activity
            android:name=".settings.SettingsExtensionsActivity"
            android:parentActivityName=".MainActivity" />
        <activity
            android:name=".settings.SettingsAddonActivity"
            android:parentActivityName=".MainActivity" />
        <activity
            android:name=".settings.SettingsMangaActivity"
            android:parentActivityName=".MainActivity" />
        <activity
            android:name=".settings.SettingsNotificationActivity"
            android:parentActivityName=".MainActivity" />
        <activity
            android:name=".settings.SettingsThemeActivity"
            android:parentActivityName=".MainActivity" />
        <activity
            android:name=".settings.ExtensionsActivity"
            android:parentActivityName=".MainActivity"
            android:windowSoftInputMode="adjustResize|stateHidden" />
        <activity
            android:name=".widgets.statistics.ProfileStatsConfigure"
            android:exported="true">
            <intent-filter>
                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
            </intent-filter>
        </activity>
        <activity
            android:name=".profile.ProfileActivity"
-            android:windowSoftInputMode="adjustResize|stateHidden"
+            android:parentActivityName=".MainActivity"
-            android:parentActivityName=".MainActivity" />
+            android:windowSoftInputMode="adjustResize|stateHidden" />
        <activity
            android:name=".profile.FollowActivity"
-            android:windowSoftInputMode="adjustResize|stateHidden"
+            android:parentActivityName=".MainActivity"
-            android:parentActivityName=".MainActivity" />
+            android:windowSoftInputMode="adjustResize|stateHidden" />
        <activity
            android:name=".profile.activity.FeedActivity"
            android:configChanges="orientation|screenSize|screenLayout"
            android:label="Inbox Activity"
-            android:parentActivityName=".MainActivity" >
+            android:parentActivityName=".MainActivity" />
        </activity>
        <activity
            android:name=".profile.activity.NotificationActivity"
            android:label="Inbox Activity"
-            android:parentActivityName=".MainActivity" >
+            android:parentActivityName=".MainActivity" />
        </activity>
        <activity
            android:name=".others.imagesearch.ImageSearchActivity"
            android:parentActivityName=".MainActivity" />
        <activity
            android:name=".util.MarkdownCreatorActivity"/>
        <activity android:name=".parsers.ParserTestActivity" />
        <activity
            android:name=".media.ReviewActivity"
            android:parentActivityName=".media.MediaDetailsActivity" />
        <activity
            android:name=".media.ReviewViewActivity"
            android:parentActivityName=".media.ReviewActivity" />
        <activity
            android:name=".media.SearchActivity"
            android:parentActivityName=".MainActivity" />
@ -136,8 +218,9 @@
            android:name=".media.CalendarActivity"
            android:parentActivityName=".MainActivity" />
        <activity android:name=".media.user.ListActivity" />
-        <activity android:name=".profile.SingleStatActivity"
+        <activity
-            android:parentActivityName=".profile.ProfileActivity"/>
+            android:name=".profile.SingleStatActivity"
            android:parentActivityName=".profile.ProfileActivity" />
        <activity
            android:name=".media.manga.mangareader.MangaReaderActivity"
            android:excludeFromRecents="true"
@ -145,13 +228,21 @@
            android:label="@string/manga"
            android:launchMode="singleTask" />
        <activity android:name=".media.GenreActivity" />
        <activity
            android:name=".media.MediaListViewActivity"
            android:parentActivityName=".MainActivity" />
        <activity
            android:name=".media.MediaDetailsActivity"
            android:parentActivityName=".MainActivity"
            android:theme="@style/Theme.Dantotsu.NeverCutout"
-            android:windowSoftInputMode="adjustResize|stateHidden"/>
+            android:windowSoftInputMode="adjustResize|stateHidden" />
        <activity android:name=".media.CharacterDetailsActivity" />
        <activity android:name=".home.NoInternet" />
        <activity android:name=".others.CrashActivity"
            android:excludeFromRecents="true"
            android:exported="true"
            android:process=":error_process"
            android:launchMode="singleTask" />
        <activity
            android:name=".media.anime.ExoplayerView"
            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden|navigation"
@ -231,7 +322,6 @@
                <data android:host="discord.dantotsu.com" />
            </intent-filter>
        </activity>
        <activity
            android:name=".connections.anilist.UrlMedia"
            android:configChanges="orientation|screenSize|layoutDirection"
@ -290,7 +380,9 @@
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <data android:scheme="content" />
                <data android:mimeType="*/*" />
                <data android:pathPattern=".*\\.ani" />
@ -299,30 +391,27 @@
            </intent-filter>
        </activity>
        <activity
-            android:name="eu.kanade.tachiyomi.extension.manga.util.MangaExtensionInstallActivity"
+            android:name="eu.kanade.tachiyomi.extension.util.ExtensionInstallActivity"
            android:exported="false"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+            android:theme="@style/Theme.AppCompat" />
        <activity
            android:name="eu.kanade.tachiyomi.extension.anime.util.AnimeExtensionInstallActivity"
            android:exported="false"
            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-        <receiver android:name=".notifications.AlarmPermissionStateReceiver"
+        <receiver
            android:name=".notifications.AlarmPermissionStateReceiver"
            android:exported="true">
            <intent-filter>
                <action android:name="android.app.action.SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED" />
            </intent-filter>
        </receiver>
-
+        <receiver
-        <receiver android:name=".notifications.BootCompletedReceiver"
+            android:name=".notifications.BootCompletedReceiver"
            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.BOOT_COMPLETED" />
            </intent-filter>
        </receiver>
-        <receiver android:name=".notifications.anilist.AnilistNotificationReceiver"/>
+        <receiver android:name=".notifications.anilist.AnilistNotificationReceiver" />
-        <receiver android:name=".notifications.comment.CommentNotificationReceiver"/>
+        <receiver android:name=".notifications.comment.CommentNotificationReceiver" />
-        <receiver android:name=".notifications.subscription.SubscriptionNotificationReceiver"/>
+        <receiver android:name=".notifications.subscription.SubscriptionNotificationReceiver" />
        <meta-data
            android:name="preloaded_fonts"
@ -340,25 +429,11 @@
        </provider>
        <service
-            android:name=".widgets.CurrentlyAiringRemoteViewsService"
+            android:name=".widgets.upcoming.UpcomingRemoteViewsService"
            android:exported="true"
            android:permission="android.permission.BIND_REMOTEVIEWS" />
        <service
-            android:name=".download.video.ExoplayerDownloadService"
+            android:name="eu.kanade.tachiyomi.extension.util.ExtensionInstallService"
            android:exported="false"
            android:foregroundServiceType="dataSync">
            <intent-filter>
                <action android:name="androidx.media3.exoplayer.downloadService.action.RESTART" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </service>
        <service
            android:name="eu.kanade.tachiyomi.extension.manga.util.MangaExtensionInstallService"
            android:exported="false"
            android:foregroundServiceType="dataSync" />
        <service
            android:name="eu.kanade.tachiyomi.extension.anime.util.AnimeExtensionInstallService"
            android:exported="false"
            android:foregroundServiceType="dataSync" />
        <service
@ -381,6 +456,11 @@
            android:name="androidx.media3.exoplayer.scheduler.PlatformScheduler$PlatformSchedulerService"
            android:exported="true"
            android:permission="android.permission.BIND_JOB_SERVICE" />
        <service
            android:name=".addons.torrent.TorrentServerService"
            android:exported="false"
            android:foregroundServiceType="dataSync"
            android:stopWithTask="true" />
        <meta-data
            android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
--- a/app/src/main/java/ani/dantotsu/App.kt
+++ b/app/src/main/java/ani/dantotsu/App.kt
@ -4,8 +4,11 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.os.Bundle
 import android.util.Log
 import androidx.multidex.MultiDex
 import androidx.multidex.MultiDexApplication
 import ani.dantotsu.addons.download.DownloadAddonManager
 import ani.dantotsu.addons.torrent.TorrentAddonManager
 import ani.dantotsu.aniyomi.anime.custom.AppModule
 import ani.dantotsu.aniyomi.anime.custom.PreferenceModule
 import ani.dantotsu.connections.comments.CommentsAPI
@ -26,13 +29,16 @@ import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager
 import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import logcat.AndroidLogcatLogger
 import logcat.LogPriority
 import logcat.LogcatLogger
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.addSingletonFactory
 import uy.kohesive.injekt.api.get
@ -41,6 +47,9 @@ class App : MultiDexApplication() {
    private lateinit var animeExtensionManager: AnimeExtensionManager
    private lateinit var mangaExtensionManager: MangaExtensionManager
    private lateinit var novelExtensionManager: NovelExtensionManager
    private lateinit var torrentAddonManager: TorrentAddonManager
    private lateinit var downloadAddonManager: DownloadAddonManager
    override fun attachBaseContext(base: Context?) {
        super.attachBaseContext(base)
        MultiDex.install(this)
@ -52,15 +61,22 @@ class App : MultiDexApplication() {
    val mFTActivityLifecycleCallbacks = FTActivityLifecycleCallbacks()
    @OptIn(DelicateCoroutinesApi::class)
    override fun onCreate() {
        super.onCreate()
        PrefManager.init(this)
        val crashlytics =
            ani.dantotsu.connections.crashlytics.CrashlyticsFactory.createCrashlytics()
        Injekt.addSingletonFactory<CrashlyticsInterface> { crashlytics }
        crashlytics.initialize(this)
        Logger.init(this)
        Thread.setDefaultUncaughtExceptionHandler(FinalExceptionHandler())
        Logger.log(Log.WARN, "App: Logging started")
        Injekt.importModule(AppModule(this))
        Injekt.importModule(PreferenceModule(this))
        val crashlytics = Injekt.get<CrashlyticsInterface>()
        crashlytics.initialize(this)
        val useMaterialYou: Boolean = PrefManager.getVal(PrefName.UseMaterialYou)
        if (useMaterialYou) {
@ -82,46 +98,47 @@ class App : MultiDexApplication() {
        }
        crashlytics.setCustomKey("device Info", SettingsActivity.getDeviceInfo())
-        Logger.init(this)
+        initializeNetwork()
        Thread.setDefaultUncaughtExceptionHandler(FinalExceptionHandler())
        Logger.log("App: Logging started")
        initializeNetwork(baseContext)
        setupNotificationChannels()
        if (!LogcatLogger.isInstalled) {
            LogcatLogger.install(AndroidLogcatLogger(LogPriority.VERBOSE))
        }
        CoroutineScope(Dispatchers.IO).launch {
            animeExtensionManager = Injekt.get()
        mangaExtensionManager = Injekt.get()
        novelExtensionManager = Injekt.get()
        val animeScope = CoroutineScope(Dispatchers.Default)
        animeScope.launch {
            animeExtensionManager.findAvailableExtensions()
            Logger.log("Anime Extensions: ${animeExtensionManager.installedExtensionsFlow.first()}")
            AnimeSources.init(animeExtensionManager.installedExtensionsFlow)
        }
-        val mangaScope = CoroutineScope(Dispatchers.Default)
+        CoroutineScope(Dispatchers.IO).launch {
-        mangaScope.launch {
+            mangaExtensionManager = Injekt.get()
            mangaExtensionManager.findAvailableExtensions()
            Logger.log("Manga Extensions: ${mangaExtensionManager.installedExtensionsFlow.first()}")
            MangaSources.init(mangaExtensionManager.installedExtensionsFlow)
        }
-        val novelScope = CoroutineScope(Dispatchers.Default)
+        CoroutineScope(Dispatchers.IO).launch {
-        novelScope.launch {
+            novelExtensionManager = Injekt.get()
            novelExtensionManager.findAvailableExtensions()
            Logger.log("Novel Extensions: ${novelExtensionManager.installedExtensionsFlow.first()}")
            NovelSources.init(novelExtensionManager.installedExtensionsFlow)
        }
-        val commentsScope = CoroutineScope(Dispatchers.Default)
+        GlobalScope.launch {
-        commentsScope.launch {
+            torrentAddonManager = Injekt.get()
-            CommentsAPI.fetchAuthToken()
+            downloadAddonManager = Injekt.get()
-        }
+            torrentAddonManager.init()
            downloadAddonManager.init()
            CommentsAPI.fetchAuthToken(this@App)
            val useAlarmManager = PrefManager.getVal<Boolean>(PrefName.UseAlarmManager)
-        TaskScheduler.create(this, useAlarmManager).scheduleAllTasks(this)
+            val scheduler = TaskScheduler.create(this@App, useAlarmManager)
            try {
                scheduler.scheduleAllTasks(this@App)
            } catch (e: IllegalStateException) {
                Logger.log("Failed to schedule tasks")
                Logger.log(e)
            }
        }
    }
    private fun setupNotificationChannels() {
@ -135,7 +152,11 @@ class App : MultiDexApplication() {
    inner class FTActivityLifecycleCallbacks : ActivityLifecycleCallbacks {
        var currentActivity: Activity? = null
-        override fun onActivityCreated(p0: Activity, p1: Bundle?) {}
+        var lastActivity: String? = null
        override fun onActivityCreated(p0: Activity, p1: Bundle?) {
            lastActivity = p0.javaClass.simpleName
        }
        override fun onActivityStarted(p0: Activity) {
            currentActivity = p0
        }
@ -151,7 +172,11 @@ class App : MultiDexApplication() {
    }
    companion object {
-        private var instance: App? = null
+        var instance: App? = null
        /** Reference to the application context.
         *
         * USE WITH EXTREME CAUTION!**/
        var context: Context? = null
        fun currentContext(): Context? {
            return instance?.mFTActivityLifecycleCallbacks?.currentActivity ?: context
--- a/app/src/main/java/ani/dantotsu/Functions.kt
+++ b/app/src/main/java/ani/dantotsu/Functions.kt
@ -10,6 +10,7 @@ import android.app.PendingIntent
 import android.content.ActivityNotFoundException
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.ComponentName
 import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
@ -66,9 +67,9 @@ import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
+import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
@ -83,6 +84,7 @@ import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.MutableLiveData
 import androidx.recyclerview.widget.RecyclerView
@ -90,16 +92,21 @@ import androidx.viewpager2.widget.ViewPager2
 import ani.dantotsu.BuildConfig.APPLICATION_ID
 import ani.dantotsu.connections.anilist.Genre
 import ani.dantotsu.connections.anilist.api.FuzzyDate
 import ani.dantotsu.connections.bakaupdates.MangaUpdates
 import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.databinding.ItemCountDownBinding
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaDetailsActivity
 import ani.dantotsu.notifications.IncognitoNotificationClickReceiver
 import ani.dantotsu.others.ImageViewDialog
 import ani.dantotsu.others.SpoilerPlugin
 import ani.dantotsu.parsers.ShowResponse
 import ani.dantotsu.profile.ProfileActivity
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.settings.saving.internal.PreferenceKeystore
 import ani.dantotsu.settings.saving.internal.PreferenceKeystore.Companion.generateSalt
 import ani.dantotsu.util.CountUpTimer
 import ani.dantotsu.util.Logger
 import com.bumptech.glide.Glide
 import com.bumptech.glide.RequestBuilder
@ -113,6 +120,7 @@ import com.bumptech.glide.load.resource.gif.GifDrawable
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.Target
 import com.bumptech.glide.request.target.ViewTarget
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
@ -132,9 +140,12 @@ import io.noties.markwon.html.TagHandlerNoOp
 import io.noties.markwon.image.AsyncDrawable
 import io.noties.markwon.image.glide.GlideImagesPlugin
 import jp.wasabeef.glide.transformations.BlurTransformation
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import nl.joery.animatedbottombar.AnimatedBottomBar
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@ -182,6 +193,11 @@ fun currActivity(): Activity? {
 var loadMedia: Int? = null
 var loadIsMAL = false
 val Int.toPx
    get() = TypedValue.applyDimension(
        TypedValue.COMPLEX_UNIT_DIP, this.toFloat(), getSystem().displayMetrics
    ).toInt()
 fun initActivity(a: Activity) {
    val window = a.window
    WindowCompat.setDecorFitsSystemWindows(window, false)
@ -201,13 +217,16 @@ fun initActivity(a: Activity) {
            ViewCompat.getRootWindowInsets(window.decorView.findViewById(android.R.id.content))
                ?.apply {
                    navBarHeight = this.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom
                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) navBarHeight += 48.toPx
                }
        }
        WindowInsetsControllerCompat(
            window,
            window.decorView
        ).hide(WindowInsetsCompat.Type.statusBars())
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && statusBarHeight == 0 && a.resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && statusBarHeight == 0
            && a.resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT
        ) {
            window.decorView.rootWindowInsets?.displayCutout?.apply {
                if (boundingRects.size > 0) {
                    statusBarHeight = min(boundingRects[0].width(), boundingRects[0].height())
@ -222,6 +241,7 @@ fun initActivity(a: Activity) {
                statusBarHeight = windowInsets.getInsets(WindowInsetsCompat.Type.statusBars()).top
                navBarHeight =
                    windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom
                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) navBarHeight += 48.toPx
            }
        }
    if (a !is MainActivity) a.setNavigationTheme()
@ -262,6 +282,56 @@ fun Activity.setNavigationTheme() {
    }
 }
 /**
 * Sets clipToPadding false and sets the combined height of navigation bars as bottom padding.
 *
 * When nesting multiple scrolling views, only call this method on the inner most scrolling view.
 */
 fun ViewGroup.setBaseline(navBar: AnimatedBottomBar) {
    navBar.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED)
    clipToPadding = false
    setPadding(paddingLeft, paddingTop, paddingRight, navBarHeight + navBar.measuredHeight)
 }
 /**
 * Sets clipToPadding false and sets the combined height of navigation bars as bottom padding.
 *
 * When nesting multiple scrolling views, only call this method on the inner most scrolling view.
 */
 fun ViewGroup.setBaseline(navBar: AnimatedBottomBar, overlayView: View) {
    navBar.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED)
    overlayView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED)
    clipToPadding = false
    setPadding(
        paddingLeft,
        paddingTop,
        paddingRight,
        navBarHeight + navBar.measuredHeight + overlayView.measuredHeight
    )
 }
 fun Activity.reloadActivity() {
    Refresh.all()
    finish()
    startActivity(Intent(this, this::class.java))
    initActivity(this)
 }
 fun Activity.restartApp() {
    val mainIntent = Intent.makeRestartActivityTask(
        packageManager.getLaunchIntentForPackage(this.packageName)!!.component
    )
    val component =
        ComponentName(this@restartApp.packageName, this@restartApp::class.qualifiedName!!)
    try {
        startActivity(Intent().setComponent(component))
    } catch (e: Exception) {
        startActivity(mainIntent)
    }
    finishAndRemoveTask()
    PrefManager.setCustomVal("reload", true)
 }
 open class BottomSheetDialogFragment : BottomSheetDialogFragment() {
    override fun onStart() {
        super.onStart()
@ -277,14 +347,8 @@ open class BottomSheetDialogFragment : BottomSheetDialogFragment() {
                val behavior = BottomSheetBehavior.from(requireView().parent as View)
                behavior.state = BottomSheetBehavior.STATE_EXPANDED
            }
-            val typedValue = TypedValue()
+            window.navigationBarColor =
-            val theme = requireContext().theme
+                requireContext().getThemeColor(com.google.android.material.R.attr.colorSurface)
            theme.resolveAttribute(
                com.google.android.material.R.attr.colorSurface,
                typedValue,
                true
            )
            window.navigationBarColor = typedValue.data
        }
    }
@ -359,7 +423,7 @@ class DatePickerFragment(activity: Activity, var date: FuzzyDate = FuzzyDate().g
        dialog.setButton(
            DialogInterface.BUTTON_NEUTRAL,
            activity.getString(R.string.remove)
-        ) { dialog, which ->
+        ) { _, which ->
            if (which == DialogInterface.BUTTON_NEUTRAL) {
                date = FuzzyDate()
            }
@ -394,7 +458,6 @@ class InputFilterMinMax(
        return ""
    }
    @SuppressLint("SetTextI18n")
    private fun isInRange(a: Double, b: Double, c: Double): Boolean {
        val statusStrings = currContext()!!.resources.getStringArray(R.array.status_manga)[2]
@ -407,7 +470,7 @@ class InputFilterMinMax(
 }
-class ZoomOutPageTransformer() :
+class ZoomOutPageTransformer :
    ViewPager2.PageTransformer {
    override fun transformPage(view: View, position: Float) {
        if (position == 0.0f && PrefManager.getVal(PrefName.LayoutAnimations)) {
@ -563,13 +626,36 @@ fun ImageView.loadImage(file: FileUrl?, size: Int = 0) {
    file?.url = PrefManager.getVal<String>(PrefName.ImageUrl).ifEmpty { file?.url ?: "" }
    if (file?.url?.isNotEmpty() == true) {
        tryWith {
            if (file.url.startsWith("content://")) {
                Glide.with(this.context).load(Uri.parse(file.url)).transition(withCrossFade())
                    .override(size).into(this)
            } else {
                val glideUrl = GlideUrl(file.url) { file.headers }
                Glide.with(this.context).load(glideUrl).transition(withCrossFade()).override(size)
                    .into(this)
            }
        }
    }
 }
 fun ImageView.loadImage(file: FileUrl?, width: Int = 0, height: Int = 0) {
    file?.url = PrefManager.getVal<String>(PrefName.ImageUrl).ifEmpty { file?.url ?: "" }
    if (file?.url?.isNotEmpty() == true) {
        tryWith {
            if (file.url.startsWith("content://")) {
                Glide.with(this.context).load(Uri.parse(file.url)).transition(withCrossFade())
                    .override(width, height).into(this)
            } else {
                val glideUrl = GlideUrl(file.url) { file.headers }
                Glide.with(this.context).load(glideUrl).transition(withCrossFade())
                    .override(width, height)
                    .into(this)
            }
        }
    }
 }
 fun ImageView.loadLocalImage(file: File?, size: Int = 0) {
    if (file?.exists() == true) {
        tryWith {
@ -712,6 +798,23 @@ fun openLinkInBrowser(link: String?) {
    }
 }
 fun openLinkInYouTube(link: String?) {
    link?.let {
        try {
            val videoIntent = Intent(Intent.ACTION_VIEW).apply {
                addCategory(Intent.CATEGORY_BROWSABLE)
                data = Uri.parse(link)
                setPackage("com.google.android.youtube")
            }
            currContext()!!.startActivity(videoIntent)
        } catch (e: ActivityNotFoundException) {
            openLinkInBrowser(link)
        } catch (e: Exception) {
            Logger.log(e)
        }
    }
 }
 fun saveImageToDownloads(title: String, bitmap: Bitmap, context: Activity) {
    FileProvider.getUriForFile(
        context,
@ -803,31 +906,6 @@ fun savePrefs(
    }
 }
 fun downloadsPermission(activity: AppCompatActivity): Boolean {
    if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) return true
    val permissions = arrayOf(
        Manifest.permission.WRITE_EXTERNAL_STORAGE,
        Manifest.permission.READ_EXTERNAL_STORAGE
    )
    val requiredPermissions = permissions.filter {
        ContextCompat.checkSelfPermission(activity, it) != PackageManager.PERMISSION_GRANTED
    }.toTypedArray()
    return if (requiredPermissions.isNotEmpty()) {
        ActivityCompat.requestPermissions(
            activity,
            requiredPermissions,
            DOWNLOADS_PERMISSION_REQUEST_CODE
        )
        false
    } else {
        true
    }
 }
 private const val DOWNLOADS_PERMISSION_REQUEST_CODE = 100
 fun shareImage(title: String, bitmap: Bitmap, context: Context) {
    val contentUri = FileProvider.getUriForFile(
@ -897,9 +975,10 @@ fun copyToClipboard(string: String, toast: Boolean = true) {
    }
 }
@SuppressLint("SetTextI18n")
 fun countDown(media: Media, view: ViewGroup) {
-    if (media.anime?.nextAiringEpisode != null && media.anime.nextAiringEpisodeTime != null && (media.anime.nextAiringEpisodeTime!! - System.currentTimeMillis() / 1000) <= 86400 * 28.toLong()) {
+    if (media.anime?.nextAiringEpisode != null && media.anime.nextAiringEpisodeTime != null
        && (media.anime.nextAiringEpisodeTime!! - System.currentTimeMillis() / 1000) <= 86400 * 28.toLong()
    ) {
        val v = ItemCountDownBinding.inflate(LayoutInflater.from(view.context), view, false)
        view.addView(v.root, 0)
        v.mediaCountdownText.text =
@ -931,6 +1010,50 @@ fun countDown(media: Media, view: ViewGroup) {
    }
 }
 fun sinceWhen(media: Media, view: ViewGroup) {
    if (media.status != "RELEASING" && media.status != "HIATUS") return
    CoroutineScope(Dispatchers.IO).launch {
        MangaUpdates().search(media.mangaName(), media.startDate)?.let {
            val latestChapter = MangaUpdates.getLatestChapter(view.context, it)
            val timeSince = (System.currentTimeMillis() -
                    (it.metadata.series.lastUpdated!!.timestamp * 1000)) / 1000
            withContext(Dispatchers.Main) {
                val v =
                    ItemCountDownBinding.inflate(LayoutInflater.from(view.context), view, false)
                view.addView(v.root, 0)
                v.mediaCountdownText.text =
                    currActivity()?.getString(R.string.chapter_release_timeout, latestChapter)
                object : CountUpTimer(86400000) {
                    override fun onTick(second: Int) {
                        val a = second + timeSince
                        v.mediaCountdown.text = currActivity()?.getString(
                            R.string.time_format,
                            a / 86400,
                            a % 86400 / 3600,
                            a % 86400 % 3600 / 60,
                            a % 86400 % 3600 % 60
                        )
                    }
                    override fun onFinish() {
                        // The legend will never die.
                    }
                }.start()
            }
        }
    }
 }
 fun displayTimer(media: Media, view: ViewGroup) {
    when {
        media.anime != null -> countDown(media, view)
        media.format == "MANGA" || media.format == "ONE_SHOT" -> sinceWhen(media, view)
        else -> {} // No timer yet
    }
 }
 fun MutableMap<String, Genre>.checkId(id: Int): Boolean {
    this.forEach {
        if (it.value.id == id) {
@ -1000,6 +1123,10 @@ class EmptyAdapter(private val count: Int) : RecyclerView.Adapter<RecyclerView.V
    inner class EmptyViewHolder(view: View) : RecyclerView.ViewHolder(view)
 }
 fun getAppString(res: Int): String {
    return currContext()?.getString(res) ?: ""
 }
 fun toast(string: String?) {
    if (string != null) {
        Logger.log(string)
@ -1010,6 +1137,10 @@ fun toast(string: String?) {
    }
 }
 fun toast(res: Int) {
    toast(getAppString(res))
 }
 fun snackString(s: String?, activity: Activity? = null, clipboard: String? = null): Snackbar? {
    try { //I have no idea why this sometimes crashes for some people...
        if (s != null) {
@ -1050,6 +1181,10 @@ fun snackString(s: String?, activity: Activity? = null, clipboard: String? = nul
    return null
 }
 fun snackString(r: Int, activity: Activity? = null, clipboard: String? = null): Snackbar? {
    return snackString(getAppString(r), activity, clipboard)
 }
 open class NoPaddingArrayAdapter<T>(context: Context, layoutId: Int, items: List<T>) :
    ArrayAdapter<T>(context, layoutId, items) {
    override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
@ -1230,24 +1365,93 @@ fun blurImage(imageView: ImageView, banner: String?) {
    if (banner != null) {
        val radius = PrefManager.getVal<Float>(PrefName.BlurRadius).toInt()
        val sampling = PrefManager.getVal<Float>(PrefName.BlurSampling).toInt()
        if (PrefManager.getVal(PrefName.BlurBanners)) {
        val context = imageView.context
        if (!(context as Activity).isDestroyed) {
            val url = PrefManager.getVal<String>(PrefName.ImageUrl).ifEmpty { banner }
            if (PrefManager.getVal(PrefName.BlurBanners)) {
                Glide.with(context as Context)
-                    .load(GlideUrl(url))
+                    .load(
-                    .diskCacheStrategy(DiskCacheStrategy.ALL).override(400)
+                        if (banner.startsWith("http")) GlideUrl(url) else if (banner.startsWith("content://")) Uri.parse(
                            url
                        ) else File(url)
                    )
                    .diskCacheStrategy(DiskCacheStrategy.RESOURCE).override(400)
                    .apply(RequestOptions.bitmapTransform(BlurTransformation(radius, sampling)))
                    .into(imageView)
-            }
+
            } else {
-            imageView.loadImage(banner)
+                Glide.with(context as Context)
                    .load(
                        if (banner.startsWith("http")) GlideUrl(url) else if (banner.startsWith("content://")) Uri.parse(
                            url
                        ) else File(url)
                    )
                    .diskCacheStrategy(DiskCacheStrategy.RESOURCE).override(400)
                    .into(imageView)
            }
        }
    } else {
        imageView.setImageResource(R.drawable.linear_gradient_bg)
    }
 }
 fun Context.getThemeColor(@AttrRes attribute: Int): Int {
    val typedValue = TypedValue()
    theme.resolveAttribute(attribute, typedValue, true)
    return typedValue.data
 }
 fun ImageView.openImage(title: String, image: String) {
    setOnLongClickListener {
        ImageViewDialog.newInstance(
            context as FragmentActivity, title, image
        )
    }
 }
 /**
 * Attempts to open the link in the app, otherwise copies it to the clipboard
 * @param link the link to open
 */
 fun openOrCopyAnilistLink(link: String) {
    if (link.startsWith("https://anilist.co/anime/") || link.startsWith("https://anilist.co/manga/")) {
        val mangaAnime = link.substringAfter("https://anilist.co/").substringBefore("/")
        val id =
            link.substringAfter("https://anilist.co/$mangaAnime/").substringBefore("/")
                .toIntOrNull()
        if (id != null && currContext() != null) {
            ContextCompat.startActivity(
                currContext()!!,
                Intent(currContext()!!, MediaDetailsActivity::class.java)
                    .putExtra("mediaId", id),
                null
            )
        } else {
            copyToClipboard(link, true)
        }
    } else if (link.startsWith("https://anilist.co/user/")) {
        val username = link.substringAfter("https://anilist.co/user/").substringBefore("/")
        val id = username.toIntOrNull()
        if (currContext() != null) {
            val intent = Intent(currContext()!!, ProfileActivity::class.java)
            if (id != null) {
                intent.putExtra("userId", id)
            } else {
                intent.putExtra("username", username)
            }
            ContextCompat.startActivity(
                currContext()!!,
                intent,
                null
            )
        } else {
            copyToClipboard(link, true)
        }
    } else {
        copyToClipboard(link, true)
    }
 }
 /**
 * Builds the markwon instance with all the plugins
 * @return the markwon instance
@ -1255,14 +1459,15 @@ fun blurImage(imageView: ImageView, banner: String?) {
 fun buildMarkwon(
    activity: Context,
    userInputContent: Boolean = true,
-    fragment: Fragment? = null
+    fragment: Fragment? = null,
    anilist: Boolean = false
 ): Markwon {
    val glideContext = fragment?.let { Glide.with(it) } ?: Glide.with(activity)
    val markwon = Markwon.builder(activity)
        .usePlugin(object : AbstractMarkwonPlugin() {
            override fun configureConfiguration(builder: MarkwonConfiguration.Builder) {
                builder.linkResolver { _, link ->
-                    copyToClipboard(link, true)
+                    openOrCopyAnilistLink(link)
                }
            }
        })
@ -1271,7 +1476,7 @@ fun buildMarkwon(
        .usePlugin(StrikethroughPlugin.create())
        .usePlugin(TablePlugin.create(activity))
        .usePlugin(TaskListPlugin.create(activity))
-        .usePlugin(SpoilerPlugin())
+        .usePlugin(SpoilerPlugin(anilist))
        .usePlugin(HtmlPlugin.create { plugin ->
            if (userInputContent) {
                plugin.addHandler(
--- a/app/src/main/java/ani/dantotsu/MainActivity.kt
+++ b/app/src/main/java/ani/dantotsu/MainActivity.kt
@ -5,7 +5,6 @@ import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.content.Intent
 import android.content.res.Configuration
 import android.content.res.Resources
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.GradientDrawable
 import android.net.Uri
@ -14,13 +13,10 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.provider.Settings
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AnticipateInterpolator
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.addCallback
 import androidx.activity.viewModels
 import androidx.annotation.OptIn
@ -36,26 +32,27 @@ import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.offline.Download
 import androidx.viewpager2.adapter.FragmentStateAdapter
-import androidx.work.OneTimeWorkRequest
+import ani.dantotsu.addons.torrent.TorrentAddonManager
 import ani.dantotsu.addons.torrent.TorrentServerService
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.connections.anilist.AnilistHomeViewModel
 import ani.dantotsu.databinding.ActivityMainBinding
 import ani.dantotsu.databinding.DialogUserAgentBinding
 import ani.dantotsu.databinding.SplashScreenBinding
 import ani.dantotsu.download.video.Helper
 import ani.dantotsu.home.AnimeFragment
 import ani.dantotsu.home.HomeFragment
 import ani.dantotsu.home.LoginFragment
 import ani.dantotsu.home.MangaFragment
 import ani.dantotsu.home.NoInternet
 import ani.dantotsu.media.MediaDetailsActivity
-import ani.dantotsu.notifications.anilist.AnilistNotificationWorker
+import ani.dantotsu.notifications.TaskScheduler
 import ani.dantotsu.notifications.comment.CommentNotificationWorker
 import ani.dantotsu.others.CustomBottomDialog
 import ani.dantotsu.others.calc.CalcActivity
 import ani.dantotsu.profile.ProfileActivity
 import ani.dantotsu.profile.activity.FeedActivity
 import ani.dantotsu.profile.activity.NotificationActivity
 import ani.dantotsu.settings.ExtensionsActivity
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefManager.asLiveBool
 import ani.dantotsu.settings.saving.PrefName
@ -70,11 +67,13 @@ import com.google.android.material.textfield.TextInputEditText
 import eu.kanade.domain.source.service.SourcePreferences
 import io.noties.markwon.Markwon
 import io.noties.markwon.SoftBreakAddsNewLinePlugin
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import nl.joery.animatedbottombar.AnimatedBottomBar
 import tachiyomi.core.util.lang.launchIO
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.Serializable
@ -87,6 +86,7 @@ class MainActivity : AppCompatActivity() {
    private var load = false
    @kotlin.OptIn(DelicateCoroutinesApi::class)
    @SuppressLint("InternalInsetResource", "DiscouragedApi")
    @OptIn(UnstableApi::class)
    override fun onCreate(savedInstanceState: Bundle?) {
@ -100,12 +100,21 @@ class MainActivity : AppCompatActivity() {
        binding = ActivityMainBinding.inflate(layoutInflater)
        setContentView(binding.root)
-
+        TaskScheduler.scheduleSingleWork(this)
-        androidx.work.WorkManager.getInstance(this)
+        if (!CalcActivity.hasPermission) {
-            .enqueue(OneTimeWorkRequest.Companion.from(CommentNotificationWorker::class.java))
+            val pin: String = PrefManager.getVal(PrefName.AppPassword)
-
+            if (pin.isNotEmpty()) {
-        androidx.work.WorkManager.getInstance(this)
+                ContextCompat.startActivity(
-            .enqueue(OneTimeWorkRequest.Companion.from(AnilistNotificationWorker::class.java))
+                    this@MainActivity,
                    Intent(this@MainActivity, CalcActivity::class.java)
                        .putExtra("code", pin)
                        .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK),
                    null
                )
                finish()
                return
            }
        }
        val action = intent.action
        val type = intent.type
@ -161,16 +170,16 @@ class MainActivity : AppCompatActivity() {
            }
        }
-        val _bottomBar = findViewById<AnimatedBottomBar>(R.id.navbar)
+        val bottomNavBar = findViewById<AnimatedBottomBar>(R.id.navbar)
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            val backgroundDrawable = _bottomBar.background as GradientDrawable
+            val backgroundDrawable = bottomNavBar.background as GradientDrawable
            val currentColor = backgroundDrawable.color?.defaultColor ?: 0
            val semiTransparentColor = (currentColor and 0x00FFFFFF) or 0xF9000000.toInt()
            backgroundDrawable.setColor(semiTransparentColor)
-            _bottomBar.background = backgroundDrawable
+            bottomNavBar.background = backgroundDrawable
        }
-        _bottomBar.background = ContextCompat.getDrawable(this, R.drawable.bottom_nav_gray)
+        bottomNavBar.background = ContextCompat.getDrawable(this, R.drawable.bottom_nav_gray)
        val offset = try {
            val statusBarHeightId = resources.getIdentifier("status_bar_height", "dimen", "android")
@ -230,17 +239,6 @@ class MainActivity : AppCompatActivity() {
            }
        }
        val preferences: SourcePreferences = Injekt.get()
        if (preferences.animeExtensionUpdatesCount()
                .get() > 0 || preferences.mangaExtensionUpdatesCount().get() > 0
        ) {
            Toast.makeText(
                this,
                "You have extension updates available!",
                Toast.LENGTH_LONG
            ).show()
        }
        binding.root.isMotionEventSplittingEnabled = false
        lifecycleScope.launch {
@ -284,6 +282,16 @@ class MainActivity : AppCompatActivity() {
        binding.root.doOnAttach {
            initActivity(this)
            val preferences: SourcePreferences = Injekt.get()
            if (preferences.animeExtensionUpdatesCount()
                    .get() > 0 || preferences.mangaExtensionUpdatesCount().get() > 0
            ) {
                snackString(R.string.extension_updates_available)
                    ?.setDuration(Snackbar.LENGTH_LONG)
                    ?.setAction(R.string.review) {
                        startActivity(Intent(this, ExtensionsActivity::class.java))
                    }
            }
            window.navigationBarColor = ContextCompat.getColor(this, android.R.color.transparent)
            selectedOption = if (fragment != null) {
                when (fragment) {
@ -295,53 +303,6 @@ class MainActivity : AppCompatActivity() {
            } else {
                PrefManager.getVal(PrefName.DefaultStartUpTab)
            }
            binding.includedNavbar.navbarContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                bottomMargin = navBarHeight
            }
        }
        intent.extras?.let { extras ->
            val fragmentToLoad = extras.getString("FRAGMENT_TO_LOAD")
            val mediaId = extras.getInt("mediaId", -1)
            val commentId = extras.getInt("commentId", -1)
            val activityId = extras.getInt("activityId", -1)
            if (fragmentToLoad != null && mediaId != -1 && commentId != -1) {
                val detailIntent = Intent(this, MediaDetailsActivity::class.java).apply {
                    putExtra("FRAGMENT_TO_LOAD", fragmentToLoad)
                    putExtra("mediaId", mediaId)
                    putExtra("commentId", commentId)
                }
                startActivity(detailIntent)
            } else if (fragmentToLoad == "FEED" && activityId != -1) {
                val feedIntent = Intent(this, FeedActivity::class.java).apply {
                    putExtra("FRAGMENT_TO_LOAD", "NOTIFICATIONS")
                    putExtra("activityId", activityId)
                }
                startActivity(feedIntent)
            } else if (fragmentToLoad == "NOTIFICATIONS" && activityId != -1) {
                Logger.log("MainActivity, onCreate: $activityId")
                val notificationIntent = Intent(this, NotificationActivity::class.java).apply {
                    putExtra("FRAGMENT_TO_LOAD", "NOTIFICATIONS")
                    putExtra("activityId", activityId)
                }
                startActivity(notificationIntent)
            }
        }
        val offlineMode: Boolean = PrefManager.getVal(PrefName.OfflineMode)
        if (!isOnline(this)) {
            snackString(this@MainActivity.getString(R.string.no_internet_connection))
            startActivity(Intent(this, NoInternet::class.java))
        } else {
            if (offlineMode) {
                snackString(this@MainActivity.getString(R.string.no_internet_connection))
                startActivity(Intent(this, NoInternet::class.java))
            } else {
                val model: AnilistHomeViewModel by viewModels()
                model.genres.observe(this) { it ->
                    if (it != null) {
                        if (it) {
            val navbar = binding.includedNavbar.navbar
            bottomBar = navbar
            navbar.visibility = View.VISIBLE
@ -351,6 +312,7 @@ class MainActivity : AppCompatActivity() {
            mainViewPager.adapter =
                ViewPagerAdapter(supportFragmentManager, lifecycle)
            mainViewPager.setPageTransformer(ZoomOutPageTransformer())
            navbar.selectTabAt(selectedOption)
            navbar.setOnTabSelectListener(object :
                AnimatedBottomBar.OnTabSelectListener {
                override fun onTabSelected(
@ -364,8 +326,7 @@ class MainActivity : AppCompatActivity() {
                    mainViewPager.setCurrentItem(newIndex, false)
                }
            })
-                            if (mainViewPager.getCurrentItem() != selectedOption) {
+            if (mainViewPager.currentItem != selectedOption) {
                                navbar.selectTabAt(selectedOption)
                mainViewPager.post {
                    mainViewPager.setCurrentItem(
                        selectedOption,
@ -373,13 +334,57 @@ class MainActivity : AppCompatActivity() {
                    )
                }
            }
            binding.includedNavbar.navbarContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                bottomMargin = navBarHeight
            }
        }
        var launched = false
        intent.extras?.let { extras ->
            val fragmentToLoad = extras.getString("FRAGMENT_TO_LOAD")
            val mediaId = extras.getInt("mediaId", -1)
            val commentId = extras.getInt("commentId", -1)
            val activityId = extras.getInt("activityId", -1)
            if (fragmentToLoad != null && mediaId != -1 && commentId != -1) {
                val detailIntent = Intent(this, MediaDetailsActivity::class.java).apply {
                    putExtra("FRAGMENT_TO_LOAD", fragmentToLoad)
                    putExtra("mediaId", mediaId)
                    putExtra("commentId", commentId)
                }
                launched = true
                startActivity(detailIntent)
            } else if (fragmentToLoad == "FEED" && activityId != -1) {
                val feedIntent = Intent(this, FeedActivity::class.java).apply {
                    putExtra("FRAGMENT_TO_LOAD", "NOTIFICATIONS")
                    putExtra("activityId", activityId)
                }
                launched = true
                startActivity(feedIntent)
            } else if (fragmentToLoad == "NOTIFICATIONS" && activityId != -1) {
                Logger.log("MainActivity, onCreate: $activityId")
                val notificationIntent = Intent(this, NotificationActivity::class.java).apply {
                    putExtra("FRAGMENT_TO_LOAD", "NOTIFICATIONS")
                    putExtra("activityId", activityId)
                }
                launched = true
                startActivity(notificationIntent)
            }
        }
        val offlineMode: Boolean = PrefManager.getVal(PrefName.OfflineMode)
        if (!isOnline(this)) {
            snackString(this@MainActivity.getString(R.string.no_internet_connection))
            startActivity(Intent(this, NoInternet::class.java))
        } else {
-                            binding.mainProgressBar.visibility = View.GONE
+            if (offlineMode) {
-                        }
+                snackString(this@MainActivity.getString(R.string.no_internet_connection))
-                    }
+                startActivity(Intent(this, NoInternet::class.java))
-                }
+            } else {
                val model: AnilistHomeViewModel by viewModels()
                //Load Data
-                if (!load) {
+                if (!load && !launched) {
                    scope.launch(Dispatchers.IO) {
                        model.loadMain(this@MainActivity)
                        val id = intent.extras?.getInt("mediaId", 0)
@ -450,51 +455,53 @@ class MainActivity : AppCompatActivity() {
                }
            }
        }
-        lifecycleScope.launch(Dispatchers.IO) {  //simple cleanup
+
-            val index = Helper.downloadManager(this@MainActivity).downloadIndex
+        val torrentManager = Injekt.get<TorrentAddonManager>()
-            val downloadCursor = index.getDownloads()
+        fun startTorrent() {
-            while (downloadCursor.moveToNext()) {
+            if (torrentManager.isAvailable() && PrefManager.getVal(PrefName.TorrentEnabled)) {
-                val download = downloadCursor.download
+                launchIO {
-                if (download.state == Download.STATE_FAILED) {
+                    if (!TorrentServerService.isRunning()) {
-                    Helper.downloadManager(this@MainActivity).removeDownload(download.request.id)
+                        TorrentServerService.start()
                    }
                }
            }
        }
        if (torrentManager.isInitialized.value == false) {
            torrentManager.isInitialized.observe(this) {
                if (it) {
                    startTorrent()
                }
            }
        } else {
            startTorrent()
        }
    }
    override fun onRestart() {
        super.onRestart()
        window.navigationBarColor = ContextCompat.getColor(this, android.R.color.transparent)
    }
    private val Int.toPx get() = TypedValue.applyDimension(
        TypedValue.COMPLEX_UNIT_DIP, this.toFloat(), Resources.getSystem().displayMetrics
    ).toInt()
    override fun onConfigurationChanged(newConfig: Configuration) {
        super.onConfigurationChanged(newConfig)
-        val params : ViewGroup.MarginLayoutParams =
+        val margin = if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) 8 else 32
        val params: ViewGroup.MarginLayoutParams =
            binding.includedNavbar.navbar.layoutParams as ViewGroup.MarginLayoutParams
-        if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE)
+        params.updateMargins(bottom = margin.toPx)
            params.updateMargins(bottom = 8.toPx)
        else
            params.updateMargins(bottom = 32.toPx)
    }
    private fun passwordAlertDialog(callback: (CharArray?) -> Unit) {
        val password = CharArray(16).apply { fill('0') }
        // Inflate the dialog layout
-        val dialogView =
+        val dialogView = DialogUserAgentBinding.inflate(layoutInflater)
-            LayoutInflater.from(this).inflate(R.layout.dialog_user_agent, null)
+        dialogView.userAgentTextBox.hint = "Password"
-        dialogView.findViewById<TextInputEditText>(R.id.userAgentTextBox)?.hint = "Password"
+        dialogView.subtitle.visibility = View.VISIBLE
-        val subtitleTextView = dialogView.findViewById<TextView>(R.id.subtitle)
+        dialogView.subtitle.text = getString(R.string.enter_password_to_decrypt_file)
        subtitleTextView?.visibility = View.VISIBLE
        subtitleTextView?.text = "Enter your password to decrypt the file"
        val dialog = AlertDialog.Builder(this, R.style.MyPopup)
            .setTitle("Enter Password")
-            .setView(dialogView)
+            .setView(dialogView.root)
            .setPositiveButton("OK", null)
            .setNegativeButton("Cancel") { dialog, _ ->
                password.fill('0')
--- a/app/src/main/java/ani/dantotsu/Network.kt
+++ b/app/src/main/java/ani/dantotsu/Network.kt
@ -1,6 +1,5 @@
 package ani.dantotsu
 import android.content.Context
 import android.os.Build
 import androidx.fragment.app.FragmentActivity
 import ani.dantotsu.others.webview.CloudFlare
@ -10,6 +9,7 @@ import com.lagradost.nicehttp.Requests
 import com.lagradost.nicehttp.ResponseParser
 import com.lagradost.nicehttp.addGenericDns
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.network.NetworkHelper.Companion.defaultUserAgentProvider
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
@ -35,13 +35,13 @@ lateinit var defaultHeaders: Map<String, String>
 lateinit var okHttpClient: OkHttpClient
 lateinit var client: Requests
-fun initializeNetwork(context: Context) {
+fun initializeNetwork() {
    val networkHelper = Injekt.get<NetworkHelper>()
    defaultHeaders = mapOf(
        "User-Agent" to
-                Injekt.get<NetworkHelper>().defaultUserAgentProvider()
+                defaultUserAgentProvider()
                    .format(Build.VERSION.RELEASE, Build.MODEL)
    )
@ -137,12 +137,14 @@ suspend fun <T> tryWithSuspend(
 * **/
 data class FileUrl(
    var url: String,
-    val headers: Map<String, String> = mapOf()
+    var headers: Map<String, String> = mapOf()
 ) : Serializable {
    companion object {
        operator fun get(url: String?, headers: Map<String, String> = mapOf()): FileUrl? {
            return FileUrl(url ?: return null, headers)
        }
        private const val serialVersionUID = 1L
    }
 }
--- a/app/src/main/java/ani/dantotsu/addons/Addon.kt
+++ b/app/src/main/java/ani/dantotsu/addons/Addon.kt
@ -0,0 +1,15 @@
 package ani.dantotsu.addons
 abstract class Addon {
    abstract val name: String
    abstract val pkgName: String
    abstract val versionName: String
    abstract val versionCode: Long
    abstract class Installed(
        override val name: String,
        override val pkgName: String,
        override val versionName: String,
        override val versionCode: Long,
    ) : Addon()
 }
--- a/app/src/main/java/ani/dantotsu/addons/AddonDownloader.kt
+++ b/app/src/main/java/ani/dantotsu/addons/AddonDownloader.kt
@ -0,0 +1,128 @@
 package ani.dantotsu.addons
 import android.app.Activity
 import android.app.NotificationManager
 import android.content.Context
 import android.os.Build
 import ani.dantotsu.Mapper
 import ani.dantotsu.R
 import ani.dantotsu.client
 import ani.dantotsu.logError
 import ani.dantotsu.openLinkInBrowser
 import ani.dantotsu.others.AppUpdater
 import ani.dantotsu.settings.InstallerSteps
 import ani.dantotsu.toast
 import ani.dantotsu.util.Logger
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.decodeFromJsonElement
 import rx.android.schedulers.AndroidSchedulers
 class AddonDownloader {
    companion object {
        private suspend fun check(repo: String): Pair<String, String> {
            return try {
                val res = client.get("https://api.github.com/repos/$repo/releases")
                    .parsed<JsonArray>().map {
                        Mapper.json.decodeFromJsonElement<AppUpdater.GithubResponse>(it)
                    }
                val r = res.maxByOrNull {
                    it.timeStamp()
                } ?: throw Exception("No Pre Release Found")
                val v = r.tagName.substringAfter("v", "")
                val md = r.body ?: ""
                val version = v.ifEmpty { throw Exception("Weird Version : ${r.tagName}") }
                Logger.log("Git Version for $repo: $version")
                Pair(md, version)
            } catch (e: Exception) {
                Logger.log("Error checking for update")
                Logger.log(e)
                Pair("", "")
            }
        }
        suspend fun hasUpdate(repo: String, currentVersion: String): Boolean {
            val (_, version) = check(repo)
            return compareVersion(version, currentVersion)
        }
        suspend fun update(
            activity: Activity,
            manager: AddonManager<*>,
            repo: String,
            currentVersion: String
        ) {
            val (_, version) = check(repo)
            if (!compareVersion(version, currentVersion)) {
                toast(activity.getString(R.string.no_update_found))
                return
            }
            MainScope().launch(Dispatchers.IO) {
                try {
                    val apks =
                        client.get("https://api.github.com/repos/$repo/releases/tags/v$version")
                            .parsed<AppUpdater.GithubResponse>().assets?.filter {
                                it.browserDownloadURL.endsWith(
                                    ".apk"
                                )
                            }
                    val apkToDownload =
                        apks?.find { it.browserDownloadURL.contains(getCurrentABI()) }
                            ?: apks?.find { it.browserDownloadURL.contains("universal") }
                            ?: apks?.first()
                    apkToDownload?.browserDownloadURL.apply {
                        if (this != null) {
                            val notificationManager =
                                activity.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
                            val installerSteps = InstallerSteps(notificationManager, activity)
                            manager.install(this)
                                .observeOn(AndroidSchedulers.mainThread())
                                .subscribe(
                                    { installStep -> installerSteps.onInstallStep(installStep) {} },
                                    { error -> installerSteps.onError(error) {} },
                                    { installerSteps.onComplete {} }
                                )
                        } else openLinkInBrowser("https://github.com/repos/$repo/releases/tag/v$version")
                    }
                } catch (e: Exception) {
                    logError(e)
                }
            }
        }
        /**
         * Returns the ABI that the app is most likely running on.
         * @return The primary ABI for the device.
         */
        private fun getCurrentABI(): String {
            return if (Build.SUPPORTED_ABIS.isNotEmpty()) {
                Build.SUPPORTED_ABIS[0]
            } else "Unknown"
        }
        private fun compareVersion(newVersion: String, oldVersion: String): Boolean {
            fun toDouble(list: List<String>): Double {
                return try {
                    list.mapIndexed { i: Int, s: String ->
                        when (i) {
                            0 -> s.toDouble() * 100
                            1 -> s.toDouble() * 10
                            2 -> s.toDouble()
                            else -> s.toDoubleOrNull() ?: 0.0
                        }
                    }.sum()
                } catch (e: NumberFormatException) {
                    0.0
                }
            }
            val new = toDouble(newVersion.split("."))
            val curr = toDouble(oldVersion.split("."))
            return new > curr
        }
    }
 }
--- a/app/src/main/java/ani/dantotsu/addons/AddonInstallReceiver.kt
+++ b/app/src/main/java/ani/dantotsu/addons/AddonInstallReceiver.kt
@ -0,0 +1,131 @@
 package ani.dantotsu.addons
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import androidx.core.content.ContextCompat
 import ani.dantotsu.addons.download.DownloadAddonManager
 import ani.dantotsu.addons.torrent.TorrentAddonManager
 import ani.dantotsu.media.AddonType
 import eu.kanade.tachiyomi.extension.util.ExtensionInstallReceiver
 import eu.kanade.tachiyomi.extension.util.ExtensionInstallReceiver.Companion.filter
 import eu.kanade.tachiyomi.extension.util.ExtensionInstallReceiver.Companion.getPackageNameFromIntent
 import kotlinx.coroutines.DelicateCoroutinesApi
 import tachiyomi.core.util.lang.launchNow
 internal class AddonInstallReceiver : BroadcastReceiver() {
    private var listener: AddonListener? = null
    private var type: AddonType? = null
    /**
     * Registers this broadcast receiver
     */
    fun register(context: Context) {
        ContextCompat.registerReceiver(context, this, filter, ContextCompat.RECEIVER_EXPORTED)
    }
    fun setListener(listener: AddonListener, type: AddonType): AddonInstallReceiver {
        this.listener = listener
        this.type = type
        return this
    }
    /**
     * Called when one of the events of the [filter] is received. When the package is an extension,
     * it's loaded in background and it notifies the [listener] when finished.
     */
    @OptIn(DelicateCoroutinesApi::class)
    override fun onReceive(context: Context, intent: Intent?) {
        if (intent == null) return
        when (intent.action) {
            Intent.ACTION_PACKAGE_ADDED -> {
                if (ExtensionInstallReceiver.isReplacing(intent)) return
                launchNow {
                    when (type) {
                        AddonType.DOWNLOAD -> {
                            getPackageNameFromIntent(intent)?.let { packageName ->
                                if (packageName != DownloadAddonManager.DOWNLOAD_PACKAGE) return@launchNow
                                listener?.onAddonInstalled(
                                    AddonLoader.loadFromPkgName(
                                        context,
                                        packageName,
                                        AddonType.DOWNLOAD
                                    )
                                )
                            }
                        }
                        AddonType.TORRENT -> {
                            getPackageNameFromIntent(intent)?.let { packageName ->
                                if (packageName != TorrentAddonManager.TORRENT_PACKAGE) return@launchNow
                                listener?.onAddonInstalled(
                                    AddonLoader.loadFromPkgName(
                                        context,
                                        packageName,
                                        AddonType.TORRENT
                                    )
                                )
                            }
                        }
                        else -> {}
                    }
                }
            }
            Intent.ACTION_PACKAGE_REPLACED -> {
                launchNow {
                    when (type) {
                        AddonType.DOWNLOAD -> {
                            getPackageNameFromIntent(intent)?.let { packageName ->
                                if (packageName != DownloadAddonManager.DOWNLOAD_PACKAGE) return@launchNow
                                listener?.onAddonUpdated(
                                    AddonLoader.loadFromPkgName(
                                        context,
                                        packageName,
                                        AddonType.DOWNLOAD
                                    )
                                )
                            }
                        }
                        AddonType.TORRENT -> {
                            getPackageNameFromIntent(intent)?.let { packageName ->
                                if (packageName != TorrentAddonManager.TORRENT_PACKAGE) return@launchNow
                                listener?.onAddonUpdated(
                                    AddonLoader.loadFromPkgName(
                                        context,
                                        packageName,
                                        AddonType.TORRENT
                                    )
                                )
                            }
                        }
                        else -> {}
                    }
                }
            }
            Intent.ACTION_PACKAGE_REMOVED -> {
                if (ExtensionInstallReceiver.isReplacing(intent)) return
                getPackageNameFromIntent(intent)?.let { packageName ->
                    when (type) {
                        AddonType.DOWNLOAD -> {
                            if (packageName != DownloadAddonManager.DOWNLOAD_PACKAGE) return
                            listener?.onAddonUninstalled(packageName)
                        }
                        AddonType.TORRENT -> {
                            if (packageName != TorrentAddonManager.TORRENT_PACKAGE) return
                            listener?.onAddonUninstalled(packageName)
                        }
                        else -> {}
                    }
                }
            }
        }
    }
 }
--- a/app/src/main/java/ani/dantotsu/addons/AddonListener.kt
+++ b/app/src/main/java/ani/dantotsu/addons/AddonListener.kt
@ -0,0 +1,11 @@
 package ani.dantotsu.addons
 interface AddonListener {
    fun onAddonInstalled(result: LoadResult?)
    fun onAddonUpdated(result: LoadResult?)
    fun onAddonUninstalled(pkgName: String)
    enum class ListenerAction {
        INSTALL, UPDATE, UNINSTALL
    }
 }
--- a/app/src/main/java/ani/dantotsu/addons/AddonLoader.kt
+++ b/app/src/main/java/ani/dantotsu/addons/AddonLoader.kt
@ -0,0 +1,176 @@
 package ani.dantotsu.addons
 import android.content.Context
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.os.Build
 import androidx.core.content.pm.PackageInfoCompat
 import ani.dantotsu.addons.download.DownloadAddon
 import ani.dantotsu.addons.download.DownloadAddonApiV2
 import ani.dantotsu.addons.download.DownloadAddonManager
 import ani.dantotsu.addons.download.DownloadLoadResult
 import ani.dantotsu.addons.torrent.TorrentAddon
 import ani.dantotsu.addons.torrent.TorrentAddonApi
 import ani.dantotsu.addons.torrent.TorrentAddonManager
 import ani.dantotsu.addons.torrent.TorrentLoadResult
 import ani.dantotsu.media.AddonType
 import ani.dantotsu.util.Logger
 import dalvik.system.PathClassLoader
 import eu.kanade.tachiyomi.extension.util.ExtensionLoader
 import eu.kanade.tachiyomi.util.system.getApplicationIcon
 class AddonLoader {
    companion object {
        /**
         * Load an extension from a package name with a specific class name
         * @param context the context
         * @param packageName the package name of the extension
         * @param type the type of extension
         * @return the loaded extension
         * @throws IllegalStateException if the extension is not of the correct type
         * @throws ClassNotFoundException if the extension class is not found
         * @throws NoClassDefFoundError if the extension class is not found
         * @throws Exception if any other error occurs
         * @throws PackageManager.NameNotFoundException if the package is not found
         * @throws IllegalStateException if the extension is not found
         */
        fun loadExtension(
            context: Context,
            packageName: String,
            className: String,
            type: AddonType
        ): LoadResult? {
            val pkgManager = context.packageManager
            val installedPkgs = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                pkgManager.getInstalledPackages(PackageManager.PackageInfoFlags.of(ExtensionLoader.PACKAGE_FLAGS.toLong()))
            } else {
                pkgManager.getInstalledPackages(ExtensionLoader.PACKAGE_FLAGS)
            }
            val extPkgs = installedPkgs.filter {
                isPackageAnExtension(
                    packageName,
                    it
                )
            }
            if (extPkgs.isEmpty()) return null
            if (extPkgs.size > 1) throw IllegalStateException("Multiple extensions with the same package name found")
            val pkgName = extPkgs.first().packageName
            val pkgInfo = extPkgs.first()
            val appInfo = try {
                pkgManager.getApplicationInfo(pkgName, PackageManager.GET_META_DATA)
            } catch (error: PackageManager.NameNotFoundException) {
                // Unlikely, but the package may have been uninstalled at this point
                Logger.log(error)
                throw error
            }
            val extName =
                pkgManager.getApplicationLabel(appInfo).toString().substringAfter("Dantotsu: ")
            val versionName = pkgInfo.versionName
            val versionCode = PackageInfoCompat.getLongVersionCode(pkgInfo)
            if (versionName.isNullOrEmpty()) {
                Logger.log("Missing versionName for extension $extName")
                throw IllegalStateException("Missing versionName for extension $extName")
            }
            val classLoader =
                PathClassLoader(appInfo.sourceDir, appInfo.nativeLibraryDir, context.classLoader)
            val loadedClass = try {
                Class.forName(className, false, classLoader)
            } catch (e: ClassNotFoundException) {
                Logger.log("ClassNotFoundException load error: $extName ($className)")
                Logger.log(e)
                throw e
            } catch (e: NoClassDefFoundError) {
                Logger.log("NoClassDefFoundError load error: $extName ($className)")
                Logger.log(e)
                throw e
            } catch (e: Exception) {
                Logger.log("Extension load error: $extName ($className)")
                Logger.log(e)
                throw e
            }
            val instance = loadedClass.getDeclaredConstructor().newInstance()
            return when (type) {
                AddonType.TORRENT -> {
                    val extension = instance as? TorrentAddonApi
                        ?: throw IllegalStateException("Extension is not a TorrentAddonApi")
                    TorrentLoadResult.Success(
                        TorrentAddon.Installed(
                            name = extName,
                            pkgName = pkgName,
                            versionName = versionName,
                            versionCode = versionCode,
                            extension = extension,
                            icon = context.getApplicationIcon(pkgName),
                        )
                    )
                }
                AddonType.DOWNLOAD -> {
                    val extension = instance as? DownloadAddonApiV2
                        ?: throw IllegalStateException("Extension is not a DownloadAddonApiV2")
                    DownloadLoadResult.Success(
                        DownloadAddon.Installed(
                            name = extName,
                            pkgName = pkgName,
                            versionName = versionName,
                            versionCode = versionCode,
                            extension = extension,
                            icon = context.getApplicationIcon(pkgName),
                        )
                    )
                }
            }
        }
        /**
         * Load an extension from a package name (class is determined by type)
         * @param context the context
         * @param packageName the package name of the extension
         * @param type the type of extension
         * @return the loaded extension
         */
        fun loadFromPkgName(context: Context, packageName: String, type: AddonType): LoadResult? {
            return try {
                when (type) {
                    AddonType.TORRENT -> loadExtension(
                        context,
                        packageName,
                        TorrentAddonManager.TORRENT_CLASS,
                        type
                    )
                    AddonType.DOWNLOAD -> loadExtension(
                        context,
                        packageName,
                        DownloadAddonManager.DOWNLOAD_CLASS,
                        type
                    )
                }
            } catch (e: Exception) {
                Logger.log("Error loading extension from package name: $packageName")
                Logger.log(e)
                null
            }
        }
        /**
         * Check if a package is an extension by comparing the package name
         * @param type the type of extension
         * @param pkgInfo the package info
         * @return true if the package is an extension
         */
        private fun isPackageAnExtension(type: String, pkgInfo: PackageInfo): Boolean {
            return pkgInfo.packageName.equals(type)
        }
    }
 }
--- a/app/src/main/java/ani/dantotsu/addons/AddonManager.kt
+++ b/app/src/main/java/ani/dantotsu/addons/AddonManager.kt
@ -0,0 +1,46 @@
 package ani.dantotsu.addons
 import android.content.Context
 import ani.dantotsu.media.AddonType
 import eu.kanade.tachiyomi.extension.InstallStep
 import eu.kanade.tachiyomi.extension.util.ExtensionInstaller
 import rx.Observable
 abstract class AddonManager<T : Addon.Installed>(
    private val context: Context
 ) {
    abstract var extension: T?
    abstract var name: String
    abstract var type: AddonType
    protected val installer by lazy { ExtensionInstaller(context) }
    var hasUpdate: Boolean = false
        protected set
    protected var onListenerAction: ((AddonListener.ListenerAction) -> Unit)? = null
    abstract suspend fun init()
    abstract fun isAvailable(andEnabled: Boolean = true): Boolean
    abstract fun getVersion(): String?
    abstract fun getPackageName(): String?
    abstract fun hadError(context: Context): String?
    abstract fun updateInstallStep(id: Long, step: InstallStep)
    abstract fun setInstalling(id: Long)
    fun uninstall() {
        getPackageName()?.let {
            installer.uninstallApk(it)
        }
    }
    fun addListenerAction(action: (AddonListener.ListenerAction) -> Unit) {
        onListenerAction = action
    }
    fun removeListenerAction() {
        onListenerAction = null
    }
    fun install(url: String): Observable<InstallStep> {
        return installer.downloadAndInstall(url, getPackageName() ?: "", name, type)
    }
 }
--- a/app/src/main/java/ani/dantotsu/addons/LoadResult.kt
+++ b/app/src/main/java/ani/dantotsu/addons/LoadResult.kt
@ -0,0 +1,8 @@
 package ani.dantotsu.addons
 abstract class LoadResult {
    abstract class Success : LoadResult()
 }
--- a/app/src/main/java/ani/dantotsu/addons/download/DownloadAddon.kt
+++ b/app/src/main/java/ani/dantotsu/addons/download/DownloadAddon.kt
@ -0,0 +1,18 @@
 package ani.dantotsu.addons.download
 import android.graphics.drawable.Drawable
 import ani.dantotsu.addons.Addon
 sealed class DownloadAddon : Addon() {
    data class Installed(
        override val name: String,
        override val pkgName: String,
        override val versionName: String,
        override val versionCode: Long,
        val extension: DownloadAddonApiV2,
        val icon: Drawable?,
        val hasUpdate: Boolean = false,
    ) : Addon.Installed(name, pkgName, versionName, versionCode)
 }
--- a/app/src/main/java/ani/dantotsu/addons/download/DownloadAddonApiV2.kt
+++ b/app/src/main/java/ani/dantotsu/addons/download/DownloadAddonApiV2.kt
@ -0,0 +1,40 @@
 package ani.dantotsu.addons.download
 import android.content.Context
 import android.net.Uri
 interface DownloadAddonApiV2 {
    fun cancelDownload(sessionId: Long)
    fun setDownloadPath(context: Context, uri: Uri): String
    fun getReadPath(context: Context, uri: Uri): String
    suspend fun executeFFProbe(
        videoUrl: String,
        headers: Map<String, String> = emptyMap(),
        logCallback: (String) -> Unit
    )
    suspend fun executeFFMpeg(
        videoUrl: String,
        downloadPath: String,
        headers: Map<String, String> = emptyMap(),
        subtitleUrls: List<Pair<String, String>> = emptyList(),
        audioUrls: List<Pair<String, String>> = emptyList(),
        statCallback: (Double) -> Unit
    ): Long
    suspend fun customFFMpeg(command: String, videoUrls: List<String>, logCallback: (String) -> Unit): Long
    suspend fun customFFProbe(command: String, videoUrls: List<String>, logCallback: (String) -> Unit)
    fun getState(sessionId: Long): String
    fun getStackTrace(sessionId: Long): String?
    fun hadError(sessionId: Long): Boolean
    fun getFileExtension(): Pair<String, String> = Pair("mkv", "video/x-matroska")
 }
--- a/app/src/main/java/ani/dantotsu/addons/download/DownloadAddonManager.kt
+++ b/app/src/main/java/ani/dantotsu/addons/download/DownloadAddonManager.kt
@ -0,0 +1,135 @@
 package ani.dantotsu.addons.download
 import android.content.Context
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import ani.dantotsu.R
 import ani.dantotsu.addons.AddonDownloader
 import ani.dantotsu.addons.AddonInstallReceiver
 import ani.dantotsu.addons.AddonListener
 import ani.dantotsu.addons.AddonLoader
 import ani.dantotsu.addons.AddonManager
 import ani.dantotsu.addons.LoadResult
 import ani.dantotsu.media.AddonType
 import ani.dantotsu.util.Logger
 import eu.kanade.tachiyomi.extension.InstallStep
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 class DownloadAddonManager(
    private val context: Context
 ) : AddonManager<DownloadAddon.Installed>(context) {
    override var extension: DownloadAddon.Installed? = null
    override var name: String = "Download Addon"
    override var type = AddonType.DOWNLOAD
    private val _isInitialized = MutableLiveData(false)
    val isInitialized: LiveData<Boolean> = _isInitialized
    private var error: String? = null
    override suspend fun init() {
        extension = null
        error = null
        hasUpdate = false
        withContext(Dispatchers.Main) {
            _isInitialized.value = false
        }
        AddonInstallReceiver()
            .setListener(InstallationListener(), type)
            .register(context)
        try {
            val result = AddonLoader.loadExtension(
                context,
                DOWNLOAD_PACKAGE,
                DOWNLOAD_CLASS,
                AddonType.DOWNLOAD
            ) as? DownloadLoadResult
            result?.let {
                if (it is DownloadLoadResult.Success) {
                    extension = it.extension
                    hasUpdate = AddonDownloader.hasUpdate(REPO, it.extension.versionName)
                }
            }
            Logger.log("Download addon initialized successfully")
            withContext(Dispatchers.Main) {
                _isInitialized.value = true
            }
        } catch (e: Exception) {
            Logger.log("Error initializing Download addon")
            Logger.log(e)
            error = e.message
        }
    }
    override fun isAvailable(andEnabled: Boolean): Boolean {
        return extension?.extension != null
    }
    override fun getVersion(): String? {
        return extension?.versionName
    }
    override fun getPackageName(): String? {
        return extension?.pkgName
    }
    override fun hadError(context: Context): String? {
        return if (isInitialized.value == true) {
            if (error != null) {
                error
            } else if (extension != null) {
                context.getString(R.string.loaded_successfully)
            } else {
                null
            }
        } else {
            null
        }
    }
    private inner class InstallationListener : AddonListener {
        override fun onAddonInstalled(result: LoadResult?) {
            if (result is DownloadLoadResult.Success) {
                extension = result.extension
                hasUpdate = false
                onListenerAction?.invoke(AddonListener.ListenerAction.INSTALL)
            }
        }
        override fun onAddonUpdated(result: LoadResult?) {
            if (result is DownloadLoadResult.Success) {
                extension = result.extension
                hasUpdate = false
                onListenerAction?.invoke(AddonListener.ListenerAction.UPDATE)
            }
        }
        override fun onAddonUninstalled(pkgName: String) {
            if (extension?.pkgName == pkgName) {
                extension = null
                hasUpdate = false
                onListenerAction?.invoke(AddonListener.ListenerAction.UNINSTALL)
            }
        }
    }
    override fun updateInstallStep(id: Long, step: InstallStep) {
        installer.updateInstallStep(id, step)
    }
    override fun setInstalling(id: Long) {
        installer.updateInstallStep(id, InstallStep.Installing)
    }
    companion object {
        const val DOWNLOAD_PACKAGE = "dantotsu.downloadAddon"
        const val DOWNLOAD_CLASS = "ani.dantotsu.downloadAddon.DownloadAddon"
        const val REPO = "rebelonion/Dantotsu-Download-Addon"
    }
 }
--- a/app/src/main/java/ani/dantotsu/addons/download/DownloadLoadResult.kt
+++ b/app/src/main/java/ani/dantotsu/addons/download/DownloadLoadResult.kt
@ -0,0 +1,7 @@
 package ani.dantotsu.addons.download
 import ani.dantotsu.addons.LoadResult
 open class DownloadLoadResult : LoadResult() {
    class Success(val extension: DownloadAddon.Installed) : DownloadLoadResult()
 }
--- a/app/src/main/java/ani/dantotsu/addons/torrent/TorrentAddon.kt
+++ b/app/src/main/java/ani/dantotsu/addons/torrent/TorrentAddon.kt
@ -0,0 +1,16 @@
 package ani.dantotsu.addons.torrent
 import android.graphics.drawable.Drawable
 import ani.dantotsu.addons.Addon
 sealed class TorrentAddon : Addon() {
    data class Installed(
        override val name: String,
        override val pkgName: String,
        override val versionName: String,
        override val versionCode: Long,
        val extension: TorrentAddonApi,
        val icon: Drawable?,
        val hasUpdate: Boolean = false,
    ) : Addon.Installed(name, pkgName, versionName, versionCode)
 }
--- a/app/src/main/java/ani/dantotsu/addons/torrent/TorrentAddonApi.kt
+++ b/app/src/main/java/ani/dantotsu/addons/torrent/TorrentAddonApi.kt
@ -0,0 +1,24 @@
 package ani.dantotsu.addons.torrent
 import eu.kanade.tachiyomi.data.torrentServer.model.Torrent
 interface TorrentAddonApi {
    fun startServer(path: String)
    fun stopServer()
    fun echo(): String
    fun removeTorrent(torrent: String)
    fun addTorrent(
        link: String,
        title: String,
        poster: String,
        data: String,
        save: Boolean,
    ): Torrent
    fun getLink(torrent: Torrent, index: Int): String
 }
--- a/app/src/main/java/ani/dantotsu/addons/torrent/TorrentAddonManager.kt
+++ b/app/src/main/java/ani/dantotsu/addons/torrent/TorrentAddonManager.kt
@ -0,0 +1,142 @@
 package ani.dantotsu.addons.torrent
 import android.content.Context
 import android.os.Build
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import ani.dantotsu.R
 import ani.dantotsu.addons.AddonDownloader.Companion.hasUpdate
 import ani.dantotsu.addons.AddonListener
 import ani.dantotsu.addons.AddonLoader
 import ani.dantotsu.addons.AddonManager
 import ani.dantotsu.addons.LoadResult
 import ani.dantotsu.addons.AddonInstallReceiver
 import ani.dantotsu.media.AddonType
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.util.Logger
 import eu.kanade.tachiyomi.extension.InstallStep
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 class TorrentAddonManager(
    private val context: Context
 ) : AddonManager<TorrentAddon.Installed>(context) {
    override var extension: TorrentAddon.Installed? = null
    override var name: String = "Torrent Addon"
    override var type: AddonType = AddonType.TORRENT
    var torrentHash: String? = null
    private val _isInitialized = MutableLiveData(false)
    val isInitialized: LiveData<Boolean> = _isInitialized
    private var error: String? = null
    override suspend fun init() {
        extension = null
        error = null
        hasUpdate = false
        withContext(Dispatchers.Main) {
            _isInitialized.value = false
        }
        if (Build.VERSION.SDK_INT < 23) {
            Logger.log("Torrent extension is not supported on this device.")
            error = context.getString(R.string.torrent_extension_not_supported)
            return
        }
        AddonInstallReceiver()
            .setListener(InstallationListener(), type)
            .register(context)
        try {
            val result = AddonLoader.loadExtension(
                context,
                TORRENT_PACKAGE,
                TORRENT_CLASS,
                type
            ) as TorrentLoadResult?
            result?.let {
                if (it is TorrentLoadResult.Success) {
                    extension = it.extension
                    hasUpdate = hasUpdate(REPO, it.extension.versionName)
                }
            }
            Logger.log("Torrent addon initialized successfully")
            withContext(Dispatchers.Main) {
                _isInitialized.value = true
            }
        } catch (e: Exception) {
            Logger.log("Error initializing torrent addon")
            Logger.log(e)
            error = e.message
        }
    }
    override fun isAvailable(andEnabled: Boolean): Boolean {
        return extension?.extension != null && if (andEnabled) {
            PrefManager.getVal(PrefName.TorrentEnabled)
        } else true
    }
    override fun getVersion(): String? {
        return extension?.versionName
    }
    override fun getPackageName(): String? {
        return extension?.pkgName
    }
    override fun hadError(context: Context): String? {
        return if (isInitialized.value == true) {
            if (error != null) {
                error
            } else if (extension != null) {
                context.getString(R.string.loaded_successfully)
            } else {
                null
            }
        } else {
            null
        }
    }
    private inner class InstallationListener : AddonListener {
        override fun onAddonInstalled(result: LoadResult?) {
            if (result is TorrentLoadResult.Success) {
                extension = result.extension
                hasUpdate = false
                onListenerAction?.invoke(AddonListener.ListenerAction.INSTALL)
            }
        }
        override fun onAddonUpdated(result: LoadResult?) {
            if (result is TorrentLoadResult.Success) {
                extension = result.extension
                hasUpdate = false
                onListenerAction?.invoke(AddonListener.ListenerAction.UPDATE)
            }
        }
        override fun onAddonUninstalled(pkgName: String) {
            if (pkgName == TORRENT_PACKAGE) {
                extension = null
                hasUpdate = false
                onListenerAction?.invoke(AddonListener.ListenerAction.UNINSTALL)
            }
        }
    }
    override fun updateInstallStep(id: Long, step: InstallStep) {
        installer.updateInstallStep(id, step)
    }
    override fun setInstalling(id: Long) {
        installer.updateInstallStep(id, InstallStep.Installing)
    }
    companion object {
        const val TORRENT_PACKAGE = "dantotsu.torrentAddon"
        const val TORRENT_CLASS = "ani.dantotsu.torrentAddon.TorrentAddon"
        const val REPO = "rebelonion/Dantotsu-Torrent-Addon"
    }
 }
--- a/app/src/main/java/ani/dantotsu/addons/torrent/TorrentLoadResult.kt
+++ b/app/src/main/java/ani/dantotsu/addons/torrent/TorrentLoadResult.kt
@ -0,0 +1,7 @@
 package ani.dantotsu.addons.torrent
 import ani.dantotsu.addons.LoadResult
 open class TorrentLoadResult : LoadResult() {
    class Success(val extension: TorrentAddon.Installed) : TorrentLoadResult()
 }
--- a/app/src/main/java/ani/dantotsu/addons/torrent/TorrentService.kt
+++ b/app/src/main/java/ani/dantotsu/addons/torrent/TorrentService.kt
@ -0,0 +1,179 @@
 /**
 * modified source from
 * https://github.com/rebelonion/Dantotsu/pull/305
 * and https://github.com/LuftVerbot/kuukiyomi
 * all credits to the original authors
 */
 package ani.dantotsu.addons.torrent
 import android.app.ActivityManager
 import android.app.Application
 import android.app.PendingIntent
 import android.app.Service
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ServiceInfo
 import android.os.Build
 import android.os.IBinder
 import ani.dantotsu.R
 import ani.dantotsu.util.Logger
 import eu.kanade.tachiyomi.data.notification.Notifications.CHANNEL_TORRENT_SERVER
 import eu.kanade.tachiyomi.data.notification.Notifications.ID_TORRENT_SERVER
 import eu.kanade.tachiyomi.util.system.cancelNotification
 import eu.kanade.tachiyomi.util.system.notificationBuilder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import kotlin.coroutines.EmptyCoroutineContext
 class TorrentServerService : Service() {
    private val serviceScope = CoroutineScope(EmptyCoroutineContext)
    private val applicationContext = Injekt.get<Application>()
    private lateinit var extension: TorrentAddonApi
    override fun onBind(intent: Intent?): IBinder? = null
    override fun onStartCommand(
        intent: Intent?,
        flags: Int,
        startId: Int,
    ): Int {
        extension = Injekt.get<TorrentAddonManager>().extension?.extension ?: return START_NOT_STICKY
        intent?.let {
            if (it.action != null) {
                when (it.action) {
                    ACTION_START -> {
                        startServer()
                        notification(applicationContext)
                        return START_STICKY
                    }
                    ACTION_STOP -> {
                        stopServer()
                        return START_NOT_STICKY
                    }
                }
            }
        }
        return START_NOT_STICKY
    }
    private fun startServer() {
        serviceScope.launch {
            val echo = extension.echo()
            if (echo == "") {
                extension.startServer(filesDir.absolutePath)
            }
        }
    }
    private fun stopServer() {
        serviceScope.launch {
            extension.stopServer()
            applicationContext.cancelNotification(ID_TORRENT_SERVER)
            stopSelf()
        }
    }
    private fun notification(context: Context) {
        val exitPendingIntent =
            PendingIntent.getService(
                applicationContext,
                0,
                Intent(applicationContext, TorrentServerService::class.java).apply {
                    action = ACTION_STOP
                },
                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
            )
        val builder = context.notificationBuilder(CHANNEL_TORRENT_SERVER) {
            setSmallIcon(R.drawable.notification_icon)
            setContentText("Torrent Server")
            setContentTitle("Server is running…")
            setAutoCancel(false)
            setOngoing(true)
            setUsesChronometer(true)
            addAction(
                R.drawable.ic_circle_cancel,
                "Stop",
                exitPendingIntent,
            )
        }
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
            startForeground(
                ID_TORRENT_SERVER,
                builder.build(),
                ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC,
            )
        } else {
            startForeground(ID_TORRENT_SERVER, builder.build())
        }
    }
    companion object {
        const val ACTION_START = "start_torrent_server"
        const val ACTION_STOP = "stop_torrent_server"
        fun isRunning(): Boolean {
            with(Injekt.get<Application>().getSystemService(ACTIVITY_SERVICE) as ActivityManager) {
                @Suppress("DEPRECATION") // We only need our services
                getRunningServices(Int.MAX_VALUE).forEach {
                    if (TorrentServerService::class.java.name.equals(it.service.className)) {
                        return true
                    }
                }
            }
            return false
        }
        fun start() {
            if (Injekt.get<TorrentAddonManager>().extension?.extension == null) {
                return
            }
            try {
                val intent =
                    Intent(Injekt.get<Application>(), TorrentServerService::class.java).apply {
                        action = ACTION_START
                    }
                Injekt.get<Application>().startService(intent)
            } catch (e: Exception) {
                e.printStackTrace()
            }
        }
        fun stop() {
            try {
                val intent =
                    Intent(Injekt.get<Application>(), TorrentServerService::class.java).apply {
                        action = ACTION_STOP
                    }
                Injekt.get<Application>().startService(intent)
            } catch (e: Exception) {
                e.printStackTrace()
            }
        }
        fun wait(timeout: Int = -1): Boolean {
            var count = 0
            if (timeout < 0) {
                count = -20
            }
            var echo = Injekt.get<TorrentAddonManager>().extension?.extension?.echo()
            while (echo == "") {
                Thread.sleep(1000)
                count++
                if (count > timeout) {
                    return false
                }
                echo = Injekt.get<TorrentAddonManager>().extension?.extension?.echo()
            }
            Logger.log("ServerService: Server started: $echo")
            return true
        }
    }
 }
--- a/app/src/main/java/ani/dantotsu/aniyomi/anime/custom/InjektModules.kt
+++ b/app/src/main/java/ani/dantotsu/aniyomi/anime/custom/InjektModules.kt
@ -6,6 +6,8 @@ import androidx.annotation.OptIn
 import androidx.core.content.ContextCompat
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.database.StandaloneDatabaseProvider
 import ani.dantotsu.addons.download.DownloadAddonManager
 import ani.dantotsu.addons.torrent.TorrentAddonManager
 import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.download.DownloadsManager
 import ani.dantotsu.media.manga.MangaCache
@ -18,6 +20,7 @@ import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.source.anime.AndroidAnimeSourceManager
 import eu.kanade.tachiyomi.source.manga.AndroidMangaSourceManager
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import tachiyomi.core.preference.PreferenceStore
 import tachiyomi.domain.source.anime.service.AnimeSourceManager
@ -29,6 +32,7 @@ import uy.kohesive.injekt.api.addSingletonFactory
 import uy.kohesive.injekt.api.get
 class AppModule(val app: Application) : InjektModule {
    @kotlin.OptIn(ExperimentalSerializationApi::class)
    @OptIn(UnstableApi::class)
    override fun InjektRegistrar.registerInjectables() {
        addSingleton(app)
@ -36,10 +40,13 @@ class AppModule(val app: Application) : InjektModule {
        addSingletonFactory { DownloadsManager(app) }
        addSingletonFactory { NetworkHelper(app) }
        addSingletonFactory { NetworkHelper(app).client }
        addSingletonFactory { AnimeExtensionManager(app) }
        addSingletonFactory { MangaExtensionManager(app) }
        addSingletonFactory { NovelExtensionManager(app) }
        addSingletonFactory { TorrentAddonManager(app) }
        addSingletonFactory { DownloadAddonManager(app) }
        addSingletonFactory<AnimeSourceManager> { AndroidAnimeSourceManager(app, get()) }
        addSingletonFactory<MangaSourceManager> { AndroidMangaSourceManager(app, get()) }
@ -53,10 +60,6 @@ class AppModule(val app: Application) : InjektModule {
        addSingletonFactory { StandaloneDatabaseProvider(app) }
        addSingletonFactory<CrashlyticsInterface> {
            ani.dantotsu.connections.crashlytics.CrashlyticsFactory.createCrashlytics()
        }
        addSingletonFactory { MangaCache() }
        ContextCompat.getMainExecutor(app).execute {
--- a/app/src/main/java/ani/dantotsu/connections/anilist/Anilist.kt
+++ b/app/src/main/java/ani/dantotsu/connections/anilist/Anilist.kt
@ -3,17 +3,16 @@ package ani.dantotsu.connections.anilist
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.net.Uri
 import android.util.Log
 import androidx.browser.customtabs.CustomTabsIntent
 import ani.dantotsu.R
 import ani.dantotsu.client
 import ani.dantotsu.connections.comments.CommentsAPI
 import ani.dantotsu.currContext
 import ani.dantotsu.openLinkInBrowser
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.snackString
 import ani.dantotsu.toast
 import ani.dantotsu.tryWithSuspend
 import ani.dantotsu.util.Logger
 import java.util.Calendar
@ -36,24 +35,60 @@ object Anilist {
    var rateLimitReset: Long = 0
    var initialized = false
    val sortBy = listOf(
        "SCORE_DESC",
        "POPULARITY_DESC",
        "TRENDING_DESC",
        "START_DATE_DESC",
        "TITLE_ENGLISH",
        "TITLE_ENGLISH_DESC",
        "SCORE"
    )
    val source = listOf(
        "ORIGINAL",
        "MANGA",
        "LIGHT NOVEL",
        "VISUAL NOVEL",
        "VIDEO GAME",
        "OTHER",
        "NOVEL",
        "DOUJINSHI",
        "ANIME",
        "WEB NOVEL",
        "LIVE ACTION",
        "GAME",
        "COMIC",
        "MULTIMEDIA PROJECT",
        "PICTURE BOOK"
    )
    val animeStatus = listOf(
        "FINISHED",
        "RELEASING",
        "NOT YET RELEASED",
        "CANCELLED"
    )
    val mangaStatus = listOf(
        "FINISHED",
        "RELEASING",
        "NOT YET RELEASED",
        "HIATUS",
        "CANCELLED"
    )
    val seasons = listOf(
        "WINTER", "SPRING", "SUMMER", "FALL"
    )
-    val anime_formats = listOf(
+    val animeFormats = listOf(
        "TV", "TV SHORT", "MOVIE", "SPECIAL", "OVA", "ONA", "MUSIC"
    )
-    val manga_formats = listOf(
+    val mangaFormats = listOf(
        "MANGA", "NOVEL", "ONE SHOT"
    )
@ -117,6 +152,9 @@ object Anilist {
        episodesWatched = null
        chapterRead = null
        PrefManager.removeVal(PrefName.AnilistToken)
        //logout from comments api
        CommentsAPI.logout()
    }
    suspend inline fun <reified T : Any> executeQuery(
@ -138,7 +176,7 @@ object Anilist {
                "variables" to variables
            )
            val headers = mutableMapOf(
-                "Content-Type" to "application/json",
+                "Content-Type" to "application/json; charset=utf-8",
                "Accept" to "application/json"
            )
@ -163,8 +201,9 @@ object Anilist {
                    toast("Rate limited. Try after $retry seconds")
                    throw Exception("Rate limited after $retry seconds")
                }
-                if (!json.text.startsWith("{")) {throw Exception(currContext()?.getString(R.string.anilist_down))}
+                if (!json.text.startsWith("{")) {
-                if (show) Logger.log("Anilist Response: ${json.text}")
+                    throw Exception(currContext()?.getString(R.string.anilist_down))
                }
                json.parsed()
            } else null
        } catch (e: Exception) {
--- a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistMutations.kt
+++ b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistMutations.kt
@ -2,6 +2,10 @@ package ani.dantotsu.connections.anilist
 import ani.dantotsu.connections.anilist.Anilist.executeQuery
 import ani.dantotsu.connections.anilist.api.FuzzyDate
 import ani.dantotsu.connections.anilist.api.Query
 import ani.dantotsu.currContext
 import com.google.gson.Gson
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 class AnilistMutations {
@ -69,4 +73,54 @@ class AnilistMutations {
        val variables = """{"id":"$listId"}"""
        executeQuery<JsonObject>(query, variables)
    }
    suspend fun rateReview(reviewId: Int, rating: String): Query.RateReviewResponse? {
        val query = "mutation{RateReview(reviewId:$reviewId,rating:$rating){id mediaId mediaType summary body(asHtml:true)rating ratingAmount userRating score private siteUrl createdAt updatedAt user{id name bannerImage avatar{medium large}}}}"
        return executeQuery<Query.RateReviewResponse>(query)
    }
    suspend fun postActivity(text:String): String {
        val encodedText = text.stringSanitizer()
        val query = "mutation{SaveTextActivity(text:$encodedText){siteUrl}}"
        val result = executeQuery<JsonObject>(query)
        val errors = result?.get("errors")
        return errors?.toString()
            ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
    }
    suspend fun postReview(summary: String, body: String, mediaId: Int, score: Int): String {
        val encodedSummary = summary.stringSanitizer()
        val encodedBody = body.stringSanitizer()
        val query = "mutation{SaveReview(mediaId:$mediaId,summary:$encodedSummary,body:$encodedBody,score:$score){siteUrl}}"
        val result = executeQuery<JsonObject>(query)
        val errors = result?.get("errors")
        return errors?.toString()
            ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
    }
    suspend fun postReply(activityId: Int, text: String): String {
        val encodedText = text.stringSanitizer()
        val query = "mutation{SaveActivityReply(activityId:$activityId,text:$encodedText){id}}"
        val result = executeQuery<JsonObject>(query)
        val errors = result?.get("errors")
        return errors?.toString()
            ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
    }
    private fun String.stringSanitizer(): String {
        val sb = StringBuilder()
        var i = 0
        while (i < this.length) {
            val codePoint = this.codePointAt(i)
            if (codePoint > 0xFFFF) {
                sb.append("&#").append(codePoint).append(";")
                i += 2
            } else {
                sb.append(this[i])
                i++
            }
        }
        return Gson().toJson(sb.toString())
    }
 }
--- a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt
+++ b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt
@ -11,6 +11,7 @@ import ani.dantotsu.connections.anilist.api.FuzzyDate
 import ani.dantotsu.connections.anilist.api.NotificationResponse
 import ani.dantotsu.connections.anilist.api.Page
 import ani.dantotsu.connections.anilist.api.Query
 import ani.dantotsu.connections.anilist.api.ReplyResponse
 import ani.dantotsu.connections.anilist.api.ToggleLike
 import ani.dantotsu.currContext
 import ani.dantotsu.isOnline
@ -20,10 +21,10 @@ import ani.dantotsu.media.Character
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.Studio
 import ani.dantotsu.others.MalScraper
 import ani.dantotsu.profile.User
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.snackString
 import ani.dantotsu.util.Logger
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.runBlocking
@ -32,6 +33,7 @@ import java.io.ByteArrayOutputStream
 import java.io.ObjectInputStream
 import java.io.ObjectOutputStream
 import java.io.Serializable
 import java.util.Calendar
 import kotlin.system.measureTimeMillis
 class AnilistQueries {
@ -56,6 +58,7 @@ class AnilistQueries {
        Anilist.unreadNotificationCount = user.unreadNotificationCount ?: 0
        val unread = PrefManager.getVal<Int>(PrefName.UnreadCommentNotifications)
        Anilist.unreadNotificationCount += unread
        Anilist.initialized = true
        return true
    }
@ -72,18 +75,19 @@ class AnilistQueries {
        media.cameFromContinue = false
        val query =
-            """{Media(id:${media.id}){id mediaListEntry{id status score(format:POINT_100)progress private notes repeat customLists updatedAt startedAt{year month day}completedAt{year month day}}isFavourite siteUrl idMal nextAiringEpisode{episode airingAt}source countryOfOrigin format duration season seasonYear startDate{year month day}endDate{year month day}genres studios(isMain:true){nodes{id name siteUrl}}description trailer{site id}synonyms tags{name rank isMediaSpoiler}characters(sort:[ROLE,FAVOURITES_DESC],perPage:25,page:1){edges{role node{id image{medium}name{userPreferred}isFavourite}}}relations{edges{relationType(version:2)node{id idMal mediaListEntry{progress private score(format:POINT_100)status}episodes chapters nextAiringEpisode{episode}popularity meanScore isAdult isFavourite format title{english romaji userPreferred}type status(version:2)bannerImage coverImage{large}}}}staffPreview:staff(perPage:8,sort:[RELEVANCE,ID]){edges{role node{id image{large medium}name{userPreferred}}}}recommendations(sort:RATING_DESC){nodes{mediaRecommendation{id idMal mediaListEntry{progress private score(format:POINT_100)status}episodes chapters nextAiringEpisode{episode}meanScore isAdult isFavourite format title{english romaji userPreferred}type status(version:2)bannerImage coverImage{large}}}}externalLinks{url site}}}"""
+            """{Media(id:${media.id}){id favourites popularity episodes chapters mediaListEntry{id status score(format:POINT_100)progress private notes repeat customLists updatedAt startedAt{year month day}completedAt{year month day}}reviews(perPage:3, sort:SCORE_DESC){nodes{id mediaId mediaType summary body(asHtml:true) rating ratingAmount userRating score private siteUrl createdAt updatedAt user{id name bannerImage avatar{medium large}}}}isFavourite siteUrl idMal nextAiringEpisode{episode airingAt}source countryOfOrigin format duration season seasonYear startDate{year month day}endDate{year month day}genres studios(isMain:true){nodes{id name siteUrl}}description trailer{site id}synonyms tags{name rank isMediaSpoiler}characters(sort:[ROLE,FAVOURITES_DESC],perPage:25,page:1){edges{role voiceActors { id name { first middle last full native userPreferred } image { large medium } languageV2 } node{id image{medium}name{userPreferred}isFavourite}}}relations{edges{relationType(version:2)node{id idMal mediaListEntry{progress private score(format:POINT_100)status}episodes chapters nextAiringEpisode{episode}popularity meanScore isAdult isFavourite format title{english romaji userPreferred}type status(version:2)bannerImage coverImage{large}}}}staffPreview:staff(perPage:8,sort:[RELEVANCE,ID]){edges{role node{id image{large medium}name{userPreferred}}}}recommendations(sort:RATING_DESC){nodes{mediaRecommendation{id idMal mediaListEntry{progress private score(format:POINT_100)status}episodes chapters nextAiringEpisode{episode}meanScore isAdult isFavourite format title{english romaji userPreferred}type status(version:2)bannerImage coverImage{large}}}}externalLinks{url site}}Page(page:1){pageInfo{total perPage currentPage lastPage hasNextPage}mediaList(isFollowing:true,sort:[STATUS],mediaId:${media.id}){id status score(format: POINT_100) progress progressVolumes user{id name avatar{large medium}}}}}"""
        runBlocking {
            val anilist = async {
-                var response = executeQuery<Query.Media>(query, force = true, show = true)
+                var response = executeQuery<Query.Media>(query, force = true)
                if (response != null) {
                    fun parse() {
                        val fetchedMedia = response?.data?.media ?: return
-
+                        val user = response?.data?.page
                        media.source = fetchedMedia.source?.toString()
                        media.countryOfOrigin = fetchedMedia.countryOfOrigin
                        media.format = fetchedMedia.format?.toString()
-
+                        media.favourites = fetchedMedia.favourites
                        media.popularity = fetchedMedia.popularity
                        media.startDate = fetchedMedia.startDate
                        media.endDate = fetchedMedia.endDate
@ -138,7 +142,15 @@ class AnilistQueries {
                                                    ?: "SUPPORTING"
                                                else -> i.role.toString()
-                                            }
+                                            },
                                            voiceActor = i.voiceActors?.map {
                                                Author(
                                                    id = it.id,
                                                    name = it.name?.userPreferred,
                                                    image = it.image?.large,
                                                    role = it.languageV2
                                                )
                                            } as ArrayList<Author>
                                        )
                                    )
                                }
@ -152,7 +164,7 @@ class AnilistQueries {
                                        Author(
                                            id = id,
                                            name = i.node?.name?.userPreferred,
-                                            image = i.node?.image?.medium,
+                                            image = i.node?.image?.large,
                                            role = when (i.role.toString()) {
                                                "MAIN" -> currContext()?.getString(R.string.main_role)
                                                    ?: "MAIN"
@ -199,7 +211,27 @@ class AnilistQueries {
                                }
                            }
                        }
-
+                        if (fetchedMedia.reviews?.nodes != null){
                            media.review = fetchedMedia.reviews!!.nodes as ArrayList<Query.Review>
                        }
                        if (user?.mediaList?.isNotEmpty() == true) {
                            media.users = user.mediaList?.mapNotNull {
                                it.user?.let { user ->
                                    if (user.id != Anilist.userid) {
                                        User(
                                            user.id,
                                            user.name ?: "Unknown",
                                            user.avatar?.large,
                                            "",
                                            it.status?.toString(),
                                            it.score,
                                            it.progress,
                                            fetchedMedia.episodes ?: fetchedMedia.chapters,
                                        )
                                    } else null
                                }
                            }?.toCollection(arrayListOf()) ?: arrayListOf()
                        }
                        if (fetchedMedia.mediaListEntry != null) {
                            fetchedMedia.mediaListEntry?.apply {
                                media.userProgress = progress
@ -344,69 +376,11 @@ class AnilistQueries {
        }
        return media
    }
    suspend fun continueMedia(type: String, planned: Boolean = false): ArrayList<Media> {
        val returnArray = arrayListOf<Media>()
        val map = mutableMapOf<Int, Media>()
        val query = if (planned) {
            """{ planned: ${continueMediaQuery(type, "PLANNING")} }"""
        } else {
            """{ 
                current: ${continueMediaQuery(type, "CURRENT")},
                repeating: ${continueMediaQuery(type, "REPEATING")}
            }"""
        }
        val response = executeQuery<Query.CombinedMediaListResponse>(query)
        if (planned) {
            response?.data?.planned?.lists?.forEach { li ->
                li.entries?.reversed()?.forEach {
                    val m = Media(it)
                    m.cameFromContinue = true
                    map[m.id] = m
                }
            }
        } else {
            response?.data?.current?.lists?.forEach { li ->
                li.entries?.reversed()?.forEach {
                    val m = Media(it)
                    m.cameFromContinue = true
                    map[m.id] = m
                }
            }
            response?.data?.repeating?.lists?.forEach { li ->
                li.entries?.reversed()?.forEach {
                    val m = Media(it)
                    m.cameFromContinue = true
                    map[m.id] = m
                }
            }
        }
        if (type != "ANIME") {
            returnArray.addAll(map.values)
            return returnArray
        }
        val list = PrefManager.getNullableCustomVal(
            "continueAnimeList",
            listOf<Int>(),
            List::class.java
        ) as List<Int>
        if (list.isNotEmpty()) {
            list.reversed().forEach {
                if (map.containsKey(it)) returnArray.add(map[it]!!)
            }
            for (i in map) {
                if (i.value !in returnArray) returnArray.add(i.value)
            }
        } else returnArray.addAll(map.values)
        return returnArray
    }
    private fun continueMediaQuery(type: String, status: String): String {
        return """ MediaListCollection(userId: ${Anilist.userid}, type: $type, status: $status , sort: UPDATED_TIME ) { lists { entries { progress private score(format:POINT_100) status media { id idMal type isAdult status chapters episodes nextAiringEpisode {episode} meanScore isFavourite format bannerImage coverImage{large} title { english romaji userPreferred } } } } } """
    }
-    suspend fun favMedia(anime: Boolean, id: Int? = Anilist.userid): ArrayList<Media> {
+    private suspend fun favMedia(anime: Boolean, id: Int? = Anilist.userid): ArrayList<Media> {
        var hasNextPage = true
        var page = 0
@ -434,41 +408,6 @@ class AnilistQueries {
        return """User(id:${id}){id favourites{${if (anime) "anime" else "manga"}(page:$page){pageInfo{hasNextPage}edges{favouriteOrder node{id idMal isAdult mediaListEntry{ progress private score(format:POINT_100) status } chapters isFavourite format episodes nextAiringEpisode{episode}meanScore isFavourite format startDate{year month day} title{english romaji userPreferred}type status(version:2)bannerImage coverImage{large}}}}}}"""
    }
    suspend fun recommendations(): ArrayList<Media> {
        val response = executeQuery<Query.Page>("""{${recommendationQuery()}}""")
        val map = mutableMapOf<Int, Media>()
        response?.data?.page?.apply {
            recommendations?.onEach {
                val json = it.mediaRecommendation
                if (json != null) {
                    val m = Media(json)
                    m.relation = json.type?.toString()
                    map[m.id] = m
                }
            }
        }
        val types = arrayOf("ANIME", "MANGA")
        suspend fun repeat(type: String) {
            val res =
                executeQuery<Query.MediaListCollection>("""{${recommendationPlannedQuery(type)}}""")
            res?.data?.mediaListCollection?.lists?.forEach { li ->
                li.entries?.forEach {
                    val m = Media(it)
                    if (m.status == "RELEASING" || m.status == "FINISHED") {
                        m.relation = it.media?.type?.toString()
                        map[m.id] = m
                    }
                }
            }
        }
        types.forEach { repeat(it) }
        val list = ArrayList(map.values.toList())
        list.sortByDescending { it.meanScore }
        return list
    }
    private fun recommendationQuery(): String {
        return """ Page(page: 1, perPage:30) { pageInfo { total currentPage hasNextPage } recommendations(sort: RATING_DESC, onList: true) { rating userRating mediaRecommendation { id idMal isAdult mediaListEntry { progress private score(format:POINT_100) status } chapters isFavourite format episodes nextAiringEpisode {episode} popularity meanScore isFavourite format title {english romaji userPreferred } type status(version: 2) bannerImage coverImage { large } } } } """
    }
@ -477,9 +416,11 @@ class AnilistQueries {
        return """ MediaListCollection(userId: ${Anilist.userid}, type: $type, status: PLANNING${if (type == "ANIME") ", sort: MEDIA_POPULARITY_DESC" else ""} ) { lists { entries { media { id mediaListEntry { progress private score(format:POINT_100) status } idMal type isAdult popularity status(version: 2) chapters episodes nextAiringEpisode {episode} meanScore isFavourite format bannerImage coverImage{large} title { english romaji userPreferred } } } } }"""
    }
-    suspend fun initHomePage(): Map<String, ArrayList<Media>> {
+    suspend fun initHomePage(): Map<String, ArrayList<*>> {
        val removeList = PrefManager.getCustomVal("removeList", setOf<Int>())
        val removedMedia = ArrayList<Media>()
        val toShow: List<Boolean> =
-            PrefManager.getVal(PrefName.HomeLayoutShow) // anime continue, anime fav, anime planned, manga continue, manga fav, manga planned, recommendations
+            PrefManager.getVal(PrefName.HomeLayout) // anime continue, anime fav, anime planned, manga continue, manga fav, manga planned, recommendations
        var query = """{"""
        if (toShow.getOrNull(0) == true) query += """currentAnime: ${
            continueMediaQuery(
@ -512,11 +453,11 @@ class AnilistQueries {
                "ANIME"
            )
        }, recommendationPlannedQueryManga: ${recommendationPlannedQuery("MANGA")}"""
        if (toShow.getOrNull(7) == true) query += "Page1:${status(1)}Page2:${status(2)}"
        query += """}""".trimEnd(',')
        val response = executeQuery<Query.HomePageMedia>(query, show = true)
-        Logger.log(response.toString())
+        val returnMap = mutableMapOf<String, ArrayList<*>>()
        val returnMap = mutableMapOf<String, ArrayList<Media>>()
        fun current(type: String) {
            val subMap = mutableMapOf<Int, Media>()
            val returnArray = arrayListOf<Media>()
@ -527,15 +468,24 @@ class AnilistQueries {
            current?.lists?.forEach { li ->
                li.entries?.reversed()?.forEach {
                    val m = Media(it)
                    if (m.id !in removeList) {
                        m.cameFromContinue = true
                        subMap[m.id] = m
                    } else {
                        removedMedia.add(m)
                    }
                }
            }
            repeating?.lists?.forEach { li ->
                li.entries?.reversed()?.forEach {
                    val m = Media(it)
                    if (m.id !in removeList) {
                        m.cameFromContinue = true
                        subMap[m.id] = m
                    } else {
                        removedMedia.add(m)
                    }
                }
            }
            if (type != "Anime") {
@ -543,6 +493,7 @@ class AnilistQueries {
                returnMap["current$type"] = returnArray
                return
            }
            @Suppress("UNCHECKED_CAST")
            val list = PrefManager.getNullableCustomVal(
                "continueAnimeList",
                listOf<Int>(),
@ -568,10 +519,15 @@ class AnilistQueries {
            current?.lists?.forEach { li ->
                li.entries?.reversed()?.forEach {
                    val m = Media(it)
                    if (m.id !in removeList) {
                        m.cameFromContinue = true
                        subMap[m.id] = m
                    } else {
                        removedMedia.add(m)
                    }
                }
            }
            @Suppress("UNCHECKED_CAST")
            val list = PrefManager.getNullableCustomVal(
                "continueAnimeList",
                listOf<Int>(),
@ -595,7 +551,12 @@ class AnilistQueries {
            val returnArray = arrayListOf<Media>()
            apiMediaList?.edges?.forEach {
                it.node?.let { i ->
-                    returnArray.add(Media(i).apply { isFav = true })
+                    val m = Media(i).apply { isFav = true }
                    if (m.id !in removeList) {
                        returnArray.add(m)
                    } else {
                        removedMedia.add(m)
                    }
                }
            }
            returnMap["favorite$type"] = returnArray
@ -657,6 +618,47 @@ class AnilistQueries {
            list.sortByDescending { it.meanScore }
            returnMap["recommendations"] = list
        }
        if (toShow.getOrNull(7) == true) {
            val list = mutableListOf<User>()
            val threeDaysAgo = Calendar.getInstance().apply {
                add(Calendar.DAY_OF_MONTH, -3)
            }.timeInMillis
            if (response?.data?.page1 != null && response.data.page2 != null) {
                val activities = listOf(
                    response.data.page1.activities,
                    response.data.page2.activities
                ).asSequence().flatten()
                    .filter { it.typename != "MessageActivity" }
                    .filter { if (Anilist.adult) true else it.media?.isAdult == false }
                    .filter { it.createdAt * 1000L > threeDaysAgo }.toList()
                    .sortedByDescending { it.createdAt }
                val anilistActivities = mutableListOf<User>()
                val groupedActivities = activities.groupBy { it.userId }
                groupedActivities.forEach { (_, userActivities) ->
                    val user = userActivities.firstOrNull()?.user
                    if (user != null) {
                        val userToAdd = User(
                            user.id,
                            user.name ?: "",
                            user.avatar?.medium,
                            user.bannerImage,
                            activity = userActivities.sortedBy { it.createdAt }.toList()
                        )
                        if (user.id == Anilist.userid) {
                            anilistActivities.add(0, userToAdd)
                        } else {
                            list.add(userToAdd)
                        }
                    }
                }
                list.addAll(0, anilistActivities)
                returnMap["status"] = ArrayList(list)
            }
            returnMap["hidden"] = removedMedia.distinctBy { it.id } as ArrayList<Media>
        }
        return returnMap
    }
@ -733,7 +735,7 @@ class AnilistQueries {
        }
        sorted["All"] = all
-        val listSort: String = if (anime) PrefManager.getVal(PrefName.AnimeListSortOrder)
+        val listSort: String? = if (anime) PrefManager.getVal(PrefName.AnimeListSortOrder)
        else PrefManager.getVal(PrefName.MangaListSortOrder)
        val sort = listSort ?: sortOrder ?: options?.rowOrder
        for (i in sorted.keys) {
@ -881,18 +883,23 @@ class AnilistQueries {
        sort: String? = null,
        genres: MutableList<String>? = null,
        tags: MutableList<String>? = null,
        status: String? = null,
        source: String? = null,
        format: String? = null,
        countryOfOrigin: String? = null,
        isAdult: Boolean = false,
        onList: Boolean? = null,
        excludedGenres: MutableList<String>? = null,
        excludedTags: MutableList<String>? = null,
        startYear: Int? = null,
        seasonYear: Int? = null,
        season: String? = null,
        id: Int? = null,
        hd: Boolean = false,
        adultOnly: Boolean = false
    ): SearchResults? {
        val query = """
-query (${"$"}page: Int = 1, ${"$"}id: Int, ${"$"}type: MediaType, ${"$"}isAdult: Boolean = false, ${"$"}search: String, ${"$"}format: [MediaFormat], ${"$"}status: MediaStatus, ${"$"}countryOfOrigin: CountryCode, ${"$"}source: MediaSource, ${"$"}season: MediaSeason, ${"$"}seasonYear: Int, ${"$"}year: String, ${"$"}onList: Boolean, ${"$"}yearLesser: FuzzyDateInt, ${"$"}yearGreater: FuzzyDateInt, ${"$"}episodeLesser: Int, ${"$"}episodeGreater: Int, ${"$"}durationLesser: Int, ${"$"}durationGreater: Int, ${"$"}chapterLesser: Int, ${"$"}chapterGreater: Int, ${"$"}volumeLesser: Int, ${"$"}volumeGreater: Int, ${"$"}licensedBy: [String], ${"$"}isLicensed: Boolean, ${"$"}genres: [String], ${"$"}excludedGenres: [String], ${"$"}tags: [String], ${"$"}excludedTags: [String], ${"$"}minimumTagRank: Int, ${"$"}sort: [MediaSort] = [POPULARITY_DESC, SCORE_DESC]) {
+query (${"$"}page: Int = 1, ${"$"}id: Int, ${"$"}type: MediaType, ${"$"}isAdult: Boolean = false, ${"$"}search: String, ${"$"}format: [MediaFormat], ${"$"}status: MediaStatus, ${"$"}countryOfOrigin: CountryCode, ${"$"}source: MediaSource, ${"$"}season: MediaSeason, ${"$"}seasonYear: Int, ${"$"}year: String, ${"$"}onList: Boolean, ${"$"}yearLesser: FuzzyDateInt, ${"$"}yearGreater: FuzzyDateInt, ${"$"}episodeLesser: Int, ${"$"}episodeGreater: Int, ${"$"}durationLesser: Int, ${"$"}durationGreater: Int, ${"$"}chapterLesser: Int, ${"$"}chapterGreater: Int, ${"$"}volumeLesser: Int, ${"$"}volumeGreater: Int, ${"$"}licensedBy: [String], ${"$"}isLicensed: Boolean, ${"$"}genres: [String], ${"$"}excludedGenres: [String], ${"$"}tags: [String], ${"$"}excludedTags: [String], ${"$"}minimumTagRank: Int, ${"$"}sort: [MediaSort] = [POPULARITY_DESC, SCORE_DESC, START_DATE_DESC]) {
  Page(page: ${"$"}page, perPage: ${perPage ?: 50}) {
    pageInfo {
      total
@ -937,14 +944,19 @@ query (${"$"}page: Int = 1, ${"$"}id: Int, ${"$"}type: MediaType, ${"$"}isAdult:
 }
        """.replace("\n", " ").replace("""  """, "")
        val variables = """{"type":"$type","isAdult":$isAdult
            ${if (adultOnly) ""","isAdult":true""" else ""}
            ${if (onList != null) ""","onList":$onList""" else ""}
            ${if (page != null) ""","page":"$page"""" else ""}
            ${if (id != null) ""","id":"$id"""" else ""}
-            ${if (seasonYear != null) ""","seasonYear":"$seasonYear"""" else ""}
+            ${if (type == "ANIME" && seasonYear != null) ""","seasonYear":"$seasonYear"""" else ""}
            ${if (type == "MANGA" && startYear != null) ""","yearGreater":${startYear}0000,"yearLesser":${startYear + 1}0000""" else ""}
            ${if (season != null) ""","season":"$season"""" else ""}
            ${if (search != null) ""","search":"$search"""" else ""}
            ${if (source != null) ""","source":"$source"""" else ""}
            ${if (sort != null) ""","sort":"$sort"""" else ""}
            ${if (status != null) ""","status":"$status"""" else ""}
            ${if (format != null) ""","format":"${format.replace(" ", "_")}"""" else ""}
            ${if (countryOfOrigin != null) ""","countryOfOrigin":"$countryOfOrigin"""" else ""}
            ${if (genres?.isNotEmpty() == true) ""","genres":[${genres.joinToString { "\"$it\"" }}]""" else ""}
            ${
            if (excludedGenres?.isNotEmpty() == true)
@ -976,7 +988,6 @@ query (${"$"}page: Int = 1, ${"$"}id: Int, ${"$"}type: MediaType, ${"$"}isAdult:
            else ""
        }
            }""".replace("\n", " ").replace("""  """, "")
        val response = executeQuery<Query.Page>(query, variables, true)?.data?.page
        if (response?.media != null) {
            val responseArray = arrayListOf<Media>()
@ -1008,7 +1019,11 @@ query (${"$"}page: Int = 1, ${"$"}id: Int, ${"$"}type: MediaType, ${"$"}isAdult:
                excludedGenres = excludedGenres,
                tags = tags,
                excludedTags = excludedTags,
                status = status,
                source = source,
                format = format,
                countryOfOrigin = countryOfOrigin,
                startYear = startYear,
                seasonYear = seasonYear,
                season = season,
                results = responseArray,
@ -1019,11 +1034,157 @@ query (${"$"}page: Int = 1, ${"$"}id: Int, ${"$"}type: MediaType, ${"$"}isAdult:
        return null
    }
    private val onListAnime =
        (if (PrefManager.getVal(PrefName.IncludeAnimeList)) "" else "onList:false").replace(
            "\"",
            ""
        )
    private val isAdult =
        (if (PrefManager.getVal(PrefName.AdultOnly)) "isAdult:true" else "").replace("\"", "")
    private fun recentAnimeUpdates(page: Int): String {
        return """Page(page:$page,perPage:50){pageInfo{hasNextPage total}airingSchedules(airingAt_greater:0 airingAt_lesser:${System.currentTimeMillis() / 1000 - 10000} sort:TIME_DESC){episode airingAt media{id idMal status chapters episodes nextAiringEpisode{episode} isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large} title{english romaji userPreferred} mediaListEntry{progress private score(format:POINT_100) status}}}}"""
    }
    private fun trendingMovies(page: Int): String {
        return """Page(page:$page,perPage:50){pageInfo{hasNextPage total}media(sort:POPULARITY_DESC, type: ANIME, format: MOVIE, $onListAnime, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
    }
    private fun topRatedAnime(page: Int): String {
        return """Page(page:$page,perPage:50){pageInfo{hasNextPage total}media(sort: SCORE_DESC, type: ANIME, $onListAnime, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
    }
    private fun mostFavAnime(page: Int): String {
        return """Page(page:$page,perPage:50){pageInfo{hasNextPage total}media(sort:FAVOURITES_DESC,type: ANIME, $onListAnime, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
    }
    suspend fun loadAnimeList(): Map<String, ArrayList<Media>> {
        val list = mutableMapOf<String, ArrayList<Media>>()
        fun query(): String {
            return """{
                recentUpdates:${recentAnimeUpdates(1)}
                recentUpdates2:${recentAnimeUpdates(2)}
                trendingMovies:${trendingMovies(1)}
                trendingMovies2:${trendingMovies(2)}
                topRated:${topRatedAnime(1)}
                topRated2:${topRatedAnime(2)}
                mostFav:${mostFavAnime(1)}
                mostFav2:${mostFavAnime(2)}
            }""".trimIndent()
        }
        executeQuery<Query.AnimeList>(query(), force = true)?.data?.apply {
            val listOnly: Boolean = PrefManager.getVal(PrefName.RecentlyListOnly)
            val adultOnly: Boolean = PrefManager.getVal(PrefName.AdultOnly)
            val idArr = mutableListOf<Int>()
            list["recentUpdates"] = recentUpdates?.airingSchedules?.mapNotNull { i ->
                i.media?.let {
                    if (!idArr.contains(it.id))
                        if (!listOnly && it.countryOfOrigin == "JP" && Anilist.adult && adultOnly && it.isAdult == true) {
                            idArr.add(it.id)
                            Media(it)
                        } else if (!listOnly && !adultOnly && (it.countryOfOrigin == "JP" && it.isAdult == false)) {
                            idArr.add(it.id)
                            Media(it)
                        } else if ((listOnly && it.mediaListEntry != null)) {
                            idArr.add(it.id)
                            Media(it)
                        } else null
                    else null
                }
            }?.toCollection(ArrayList()) ?: arrayListOf()
            list["trendingMovies"] = trendingMovies?.media?.map { Media(it) }?.toCollection(ArrayList()) ?: arrayListOf()
            list["topRated"] =  topRated?.media?.map { Media(it) }?.toCollection(ArrayList()) ?: arrayListOf()
            list["mostFav"] = mostFav?.media?.map { Media(it) }?.toCollection(ArrayList()) ?: arrayListOf()
            list["recentUpdates"]?.addAll(recentUpdates2?.airingSchedules?.mapNotNull { i ->
                i.media?.let {
                    if (!idArr.contains(it.id))
                        if (!listOnly && it.countryOfOrigin == "JP" && Anilist.adult && adultOnly && it.isAdult == true) {
                            idArr.add(it.id)
                            Media(it)
                        } else if (!listOnly && !adultOnly && (it.countryOfOrigin == "JP" && it.isAdult == false)) {
                            idArr.add(it.id)
                            Media(it)
                        } else if ((listOnly && it.mediaListEntry != null)) {
                            idArr.add(it.id)
                            Media(it)
                        } else null
                    else null
                }
            }?.toCollection(ArrayList()) ?: arrayListOf())
            list["trendingMovies"]?.addAll(trendingMovies2?.media?.map { Media(it) }?.toCollection(ArrayList()) ?: arrayListOf())
            list["topRated"]?.addAll(topRated2?.media?.map { Media(it) }?.toCollection(ArrayList()) ?: arrayListOf())
            list["mostFav"]?.addAll(mostFav2?.media?.map { Media(it) }?.toCollection(ArrayList()) ?: arrayListOf())
        }
        return list
    }
    private val onListManga =
        (if (PrefManager.getVal(PrefName.IncludeMangaList)) "" else "onList:false").replace(
            "\"",
            ""
        )
    private fun trendingManga(page: Int): String {
        return """Page(page:$page,perPage:50){pageInfo{hasNextPage total}media(sort:POPULARITY_DESC, type: MANGA,countryOfOrigin:JP, $onListManga, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
    }
    private fun trendingManhwa(page: Int): String {
        return """Page(page:$page,perPage:50){pageInfo{hasNextPage total}media(sort:POPULARITY_DESC, type: MANGA, countryOfOrigin:KR, $onListManga, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
    }
    private fun trendingNovel(page: Int): String {
        return """Page(page:$page,perPage:50){pageInfo{hasNextPage total}media(sort:POPULARITY_DESC, type: MANGA, format: NOVEL, countryOfOrigin:JP, $onListManga, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
    }
    private fun topRatedManga(page: Int): String {
        return """Page(page:$page,perPage:50){pageInfo{hasNextPage total}media(sort: SCORE_DESC, type: MANGA, $onListManga, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
    }
    private fun mostFavManga(page: Int): String {
        return """Page(page:$page,perPage:50){pageInfo{hasNextPage total}media(sort:FAVOURITES_DESC,type: MANGA, $onListManga, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
    }
    suspend fun loadMangaList(): Map<String, ArrayList<Media>> {
        val list = mutableMapOf<String, ArrayList<Media>>()
        fun query(): String {
            return """{
                trendingManga:${trendingManga(1)}
                trendingManga2:${trendingManga(2)}
                trendingManhwa:${trendingManhwa(1)}
                trendingManhwa2:${trendingManhwa(2)}
                trendingNovel:${trendingNovel(1)}
                trendingNovel2:${trendingNovel(2)}
                topRated:${topRatedManga(1)}
                topRated2:${topRatedManga(2)}
                mostFav:${mostFavManga(1)}
                mostFav2:${mostFavManga(2)}
            }""".trimIndent()
        }
        executeQuery<Query.MangaList>(query(), force = true)?.data?.apply {
            list["trendingManga"] = trendingManga?.media?.map { Media(it) }?.toCollection(ArrayList()) ?: arrayListOf()
            list["trendingManhwa"] = trendingManhwa?.media?.map { Media(it) }?.toCollection(ArrayList()) ?: arrayListOf()
            list["trendingNovel"] = trendingNovel?.media?.map { Media(it) }?.toCollection(ArrayList()) ?: arrayListOf()
            list["topRated"] = topRated?.media?.map { Media(it) }?.toCollection(ArrayList()) ?: arrayListOf()
            list["mostFav"] = mostFav?.media?.map { Media(it) }?.toCollection(ArrayList()) ?: arrayListOf()
            list["trendingManga"]?.addAll(trendingManga2?.media?.map { Media(it) }?.toList() ?: arrayListOf())
            list["trendingManhwa"]?.addAll(trendingManhwa2?.media?.map { Media(it) }?.toList() ?: arrayListOf())
            list["trendingNovel"]?.addAll(trendingNovel2?.media?.map { Media(it) }?.toList() ?: arrayListOf())
            list["topRated"]?.addAll(topRated2?.media?.map { Media(it) }?.toList() ?: arrayListOf())
            list["mostFav"]?.addAll(mostFav2?.media?.map { Media(it) }?.toList() ?: arrayListOf())
        }
        return list
    }
    suspend fun recentlyUpdated(
        smaller: Boolean = true,
        greater: Long = 0,
        lesser: Long = System.currentTimeMillis() / 1000 - 10000
-    ): MutableList<Media>? {
+    ): MutableList<Media> {
        suspend fun execute(page: Int = 1): Page? {
            val query = """{
 Page(page:$page,perPage:50) {
@ -1070,21 +1231,7 @@ Page(page:$page,perPage:50) {
        }""".replace("\n", " ").replace("""  """, "")
            return executeQuery<Query.Page>(query, force = true)?.data?.page
        }
-        if (smaller) {
+
            val response = execute()?.airingSchedules ?: return null
            val idArr = mutableListOf<Int>()
            val listOnly: Boolean = PrefManager.getVal(PrefName.RecentlyListOnly)
            return response.mapNotNull { i ->
                i.media?.let {
                    if (!idArr.contains(it.id))
                        if (!listOnly && (it.countryOfOrigin == "JP" && (if (!Anilist.adult) it.isAdult == false else true)) || (listOnly && it.mediaListEntry != null)) {
                            idArr.add(it.id)
                            Media(it)
                        } else null
                    else null
                }
            }.toMutableList()
        } else {
        var i = 1
        val list = mutableListOf<Media>()
        var res: Page? = null
@ -1105,7 +1252,6 @@ Page(page:$page,perPage:50) {
        }
        return list.reversed().toMutableList()
    }
    }
    suspend fun getCharacterDetails(character: Character): Character {
        val query = """ {
@ -1290,19 +1436,39 @@ Page(page:$page,perPage:50) {
        }
      }
    }
    characters(page: $page,sort:FAVOURITES_DESC) {
      pageInfo{
        hasNextPage
      }
      nodes{
        id
        name {
          first
          middle
          last
          full
          native
          userPreferred
        }
        image {
          large
          medium
        }
      }
    }
  }
 }""".replace("\n", " ").replace("""  """, "")
        var hasNextPage = true
        val yearMedia = mutableMapOf<String, ArrayList<Media>>()
        var page = 0
-
+        val characters = arrayListOf<Character>()
        while (hasNextPage) {
            page++
-            hasNextPage = executeQuery<Query.Author>(
+            val query = executeQuery<Query.Author>(
-                query(page),
+                query(page), force = true
-                force = true
+            )?.data?.author
-            )?.data?.author?.staffMedia?.let {
+            hasNextPage = query?.staffMedia?.let {
                it.edges?.forEach { i ->
                    i.node?.apply {
                        val status = status.toString()
@ -1317,6 +1483,20 @@ Page(page:$page,perPage:50) {
                }
                it.pageInfo?.hasNextPage == true
            } ?: false
            query?.characters?.let {
                it.nodes?.forEach { i ->
                    characters.add(
                        Character(
                            i.id,
                            i.name?.userPreferred,
                            i.image?.large,
                            i.image?.medium,
                            "",
                            false
                        )
                    )
                }
            }
        }
        if (yearMedia.contains("CANCELLED")) {
@ -1324,10 +1504,18 @@ Page(page:$page,perPage:50) {
            yearMedia.remove("CANCELLED")
            yearMedia["CANCELLED"] = a
        }
        author.character = characters
        author.yearMedia = yearMedia
        return author
    }
    suspend fun getReviews(mediaId: Int, page: Int = 1, sort: String = "SCORE_DESC"): Query.ReviewsResponse? {
        return executeQuery<Query.ReviewsResponse>(
            """{Page(page:$page,perPage:10){pageInfo{currentPage,hasNextPage,total}reviews(mediaId:$mediaId,sort:$sort){id,mediaId,mediaType,summary,body(asHtml:true)rating,ratingAmount,userRating,score,private,siteUrl,createdAt,updatedAt,user{id,name,bannerImage avatar{medium,large}}}}}""",
            force = true
        )
    }
    suspend fun toggleFollow(id: Int): Query.ToggleFollow? {
        return executeQuery<Query.ToggleFollow>(
            """mutation{ToggleFollow(userId:$id){id, isFollowing, isFollower}}"""
@ -1352,7 +1540,7 @@ Page(page:$page,perPage:50) {
        return getUserProfile(id)
    }
-    suspend fun getUserId(username: String): Int? {
+    private suspend fun getUserId(username: String): Int? {
        return executeQuery<Query.User>(
            """{User(name:"$username"){id}}""",
            force = true
@ -1367,8 +1555,8 @@ Page(page:$page,perPage:50) {
        )
    }
-    private fun userFavMediaQuery(anime: Boolean, page: Int, id: Int): String {
+    private fun userFavMediaQuery(anime: Boolean, id: Int): String {
-        return """User(id:${id}){id favourites{${if (anime) "anime" else "manga"}(page:$page){pageInfo{hasNextPage}edges{favouriteOrder node{id idMal isAdult mediaListEntry{ progress private score(format:POINT_100) status } chapters isFavourite format episodes nextAiringEpisode{episode}meanScore isFavourite format startDate{year month day} title{english romaji userPreferred}type status(version:2)bannerImage coverImage{large}}}}}}"""
+        return """User(id:${id}){id favourites{${if (anime) "anime" else "manga"}(page:1){pageInfo{hasNextPage}edges{favouriteOrder node{id idMal isAdult mediaListEntry{ progress private score(format:POINT_100) status } chapters isFavourite format episodes nextAiringEpisode{episode}meanScore isFavourite format startDate{year month day} title{english romaji userPreferred}type status(version:2)bannerImage coverImage{large}}}}}}"""
    }
    suspend fun userFollowing(id: Int): Query.Following? {
@ -1388,19 +1576,18 @@ Page(page:$page,perPage:50) {
    suspend fun initProfilePage(id: Int): Query.ProfilePageMedia? {
        return executeQuery<Query.ProfilePageMedia>(
            """{
-            favoriteAnime:${userFavMediaQuery(true, 1, id)}
+            favoriteAnime:${userFavMediaQuery(true, id)}
-            favoriteManga:${userFavMediaQuery(false, 1, id)}
+            favoriteManga:${userFavMediaQuery(false, id)}
            animeMediaList:${bannerImageQuery("ANIME", id)}
            mangaMediaList:${bannerImageQuery("MANGA", id)}
            }""".trimIndent(), force = true
        )
    }
    private fun bannerImageQuery(type: String, id: Int?): String {
        return """MediaListCollection(userId: ${id}, type: $type, chunk:1,perChunk:25, sort: [SCORE_DESC,UPDATED_TIME_DESC]) { lists { entries{ media { id bannerImage } } } }"""
    }
-    suspend fun getNotifications(id: Int, page: Int = 1, resetNotification: Boolean = true): NotificationResponse? {
+    suspend fun getNotifications(
        id: Int,
        page: Int = 1,
        resetNotification: Boolean = true
    ): NotificationResponse? {
        val reset = if (resetNotification) "true" else "false"
        val res = executeQuery<NotificationResponse>(
            """{User(id:$id){unreadNotificationCount}Page(page:$page,perPage:$ITEMS_PER_PAGE){pageInfo{currentPage,hasNextPage}notifications(resetNotificationCount:$reset){__typename...on AiringNotification{id,type,animeId,episode,contexts,createdAt,media{id,title{romaji,english,native,userPreferred}bannerImage,coverImage{medium,large}},}...on FollowingNotification{id,userId,type,context,createdAt,user{id,name,bannerImage,avatar{medium,large,}}}...on ActivityMessageNotification{id,userId,type,activityId,context,createdAt,message{id}user{id,name,bannerImage,avatar{medium,large,}}}...on ActivityMentionNotification{id,userId,type,activityId,context,createdAt,activity{__typename}user{id,name,bannerImage,avatar{medium,large,}}}...on ActivityReplyNotification{id,userId,type,activityId,context,createdAt,activity{__typename}user{id,name,bannerImage,avatar{medium,large,}}}...on ActivityReplySubscribedNotification{id,userId,type,activityId,context,createdAt,activity{__typename}user{id,name,bannerImage,avatar{medium,large,}}}...on ActivityLikeNotification{id,userId,type,activityId,context,createdAt,activity{__typename}user{id,name,bannerImage,avatar{medium,large,}}}...on ActivityReplyLikeNotification{id,userId,type,activityId,context,createdAt,activity{__typename}user{id,name,bannerImage,avatar{medium,large,}}}...on ThreadCommentMentionNotification{id,userId,type,commentId,context,createdAt,thread{id}comment{id}user{id,name,bannerImage,avatar{medium,large,}}}...on ThreadCommentReplyNotification{id,userId,type,commentId,context,createdAt,thread{id}comment{id}user{id,name,bannerImage,avatar{medium,large,}}}...on ThreadCommentSubscribedNotification{id,userId,type,commentId,context,createdAt,thread{id}comment{id}user{id,name,bannerImage,avatar{medium,large,}}}...on ThreadCommentLikeNotification{id,userId,type,commentId,context,createdAt,thread{id}comment{id}user{id,name,bannerImage,avatar{medium,large,}}}...on ThreadLikeNotification{id,userId,type,threadId,context,createdAt,thread{id}comment{id}user{id,name,bannerImage,avatar{medium,large,}}}...on RelatedMediaAdditionNotification{id,type,context,createdAt,media{id,title{romaji,english,native,userPreferred}bannerImage,coverImage{medium,large}}}...on MediaDataChangeNotification{id,type,mediaId,context,reason,createdAt,media{id,title{romaji,english,native,userPreferred}bannerImage,coverImage{medium,large}}}...on MediaMergeNotification{id,type,mediaId,deletedMediaTitles,context,reason,createdAt,media{id,title{romaji,english,native,userPreferred}bannerImage,coverImage{medium,large}}}...on MediaDeletionNotification{id,type,deletedMediaTitle,context,reason,createdAt,}}}}""",
@ -1415,25 +1602,72 @@ Page(page:$page,perPage:50) {
        return res
    }
-    suspend fun getFeed(userId: Int?, global: Boolean = false, page: Int = 1, activityId: Int? = null): FeedResponse? {
+    suspend fun getFeed(
        userId: Int?,
        global: Boolean = false,
        page: Int = 1,
        activityId: Int? = null
    ): FeedResponse? {
        val filter = if (activityId != null) "id:$activityId,"
        else if (userId != null) "userId:$userId,"
        else if (global) "isFollowing:false,hasRepliesOrTypeText:true,"
-        else "isFollowing:true,type_not:MESSAGE,"
+        else "isFollowing:true,"
        return executeQuery<FeedResponse>(
-            """{Page(page:$page,perPage:$ITEMS_PER_PAGE){activities(${filter}sort:ID_DESC){__typename ... on TextActivity{id userId type replyCount text(asHtml:true)siteUrl isLocked isSubscribed likeCount isLiked isPinned createdAt user{id name bannerImage avatar{medium large}}replies{id userId activityId text(asHtml:true)likeCount isLiked createdAt user{id name bannerImage avatar{medium large}}likes{id name bannerImage avatar{medium large}}}likes{id name bannerImage avatar{medium large}}}... on ListActivity{id userId type replyCount status progress siteUrl isLocked isSubscribed likeCount isLiked isPinned createdAt user{id name bannerImage avatar{medium large}}media{id title{english romaji native userPreferred}bannerImage coverImage{medium large}}replies{id userId activityId text(asHtml:true)likeCount isLiked createdAt user{id name bannerImage avatar{medium large}}likes{id name bannerImage avatar{medium large}}}likes{id name bannerImage avatar{medium large}}}... on MessageActivity{id recipientId messengerId type replyCount likeCount message(asHtml:true)isLocked isSubscribed isLiked isPrivate siteUrl createdAt recipient{id name bannerImage avatar{medium large}}messenger{id name bannerImage avatar{medium large}}replies{id userId activityId text(asHtml:true)likeCount isLiked createdAt user{id name bannerImage avatar{medium large}}likes{id name bannerImage avatar{medium large}}}likes{id name bannerImage avatar{medium large}}}}}}""",
+            """{Page(page:$page,perPage:$ITEMS_PER_PAGE){activities(${filter}sort:ID_DESC){__typename ... on TextActivity{id userId type replyCount text(asHtml:true)siteUrl isLocked isSubscribed likeCount isLiked isPinned createdAt user{id name bannerImage avatar{medium large}}replies{id userId activityId text(asHtml:true)likeCount isLiked createdAt user{id name bannerImage avatar{medium large}}likes{id name bannerImage avatar{medium large}}}likes{id name bannerImage avatar{medium large}}}... on ListActivity{id userId type replyCount status progress siteUrl isLocked isSubscribed likeCount isLiked isPinned createdAt user{id name bannerImage avatar{medium large}}media{id title{english romaji native userPreferred}bannerImage coverImage{medium large}isAdult}replies{id userId activityId text(asHtml:true)likeCount isLiked createdAt user{id name bannerImage avatar{medium large}}likes{id name bannerImage avatar{medium large}}}likes{id name bannerImage avatar{medium large}}}... on MessageActivity{id recipientId messengerId type replyCount likeCount message(asHtml:true)isLocked isSubscribed isLiked isPrivate siteUrl createdAt recipient{id name bannerImage avatar{medium large}}messenger{id name bannerImage avatar{medium large}}replies{id userId activityId text(asHtml:true)likeCount isLiked createdAt user{id name bannerImage avatar{medium large}}likes{id name bannerImage avatar{medium large}}}likes{id name bannerImage avatar{medium large}}}}}}""",
            force = true
        )
    }
-    suspend fun isUserFav(favType: AnilistMutations.FavType, id: Int): Boolean {   //anilist isFavourite is broken, so we need to check it manually
+    suspend fun getReplies(
-        val res = getUserProfile(Anilist.userid?: return false)
+        activityId: Int,
        page: Int = 1
    ) : ReplyResponse? {
        val query = """{Page(page:$page,perPage:50){activityReplies(activityId:$activityId){id userId activityId text(asHtml:true)likeCount isLiked createdAt user{id name bannerImage avatar{medium large}}likes{id name bannerImage avatar{medium large}}}}}"""
        return executeQuery(query, force = true)
    }
    private fun status(page: Int = 1): String {
        return """Page(page:$page,perPage:50){activities(isFollowing: true,sort:ID_DESC){__typename ... on TextActivity{id userId type replyCount text(asHtml:true)siteUrl isLocked isSubscribed replyCount likeCount isLiked createdAt user{id name bannerImage avatar{medium large}}likes{id name bannerImage avatar{medium large}}}... on ListActivity{id userId type replyCount status progress siteUrl isLocked isSubscribed replyCount likeCount isLiked isPinned createdAt user{id name bannerImage avatar{medium large}}media{id isAdult title{english romaji native userPreferred}bannerImage coverImage{extraLarge medium large}}likes{id name bannerImage avatar{medium large}}}... on MessageActivity{id type createdAt}}}"""
    }
    suspend fun getUpcomingAnime(id: String): List<Media> {
        val res = executeQuery<Query.MediaListCollection>(
            """{MediaListCollection(userId:$id,type:ANIME){lists{name entries{media{id,isFavourite,title{userPreferred,romaji}coverImage{medium}nextAiringEpisode{timeUntilAiring}}}}}}""",
            force = true
        )
        val list = mutableListOf<Media>()
        res?.data?.mediaListCollection?.lists?.forEach { listEntry ->
            listEntry.entries?.forEach { entry ->
                entry.media?.nextAiringEpisode?.timeUntilAiring?.let {
                    list.add(Media(entry.media!!))
                }
            }
        }
        return list.sortedBy { it.timeUntilAiring }
            .distinctBy { it.id }
            .filter { it.timeUntilAiring != null }
    }
    suspend fun isUserFav(
        favType: AnilistMutations.FavType,
        id: Int
    ): Boolean {   //anilist isFavourite is broken, so we need to check it manually
        val res = getUserProfile(Anilist.userid ?: return false)
        return when (favType) {
-            AnilistMutations.FavType.ANIME -> res?.data?.user?.favourites?.anime?.nodes?.any { it.id == id } ?: false
+            AnilistMutations.FavType.ANIME -> res?.data?.user?.favourites?.anime?.nodes?.any { it.id == id }
-            AnilistMutations.FavType.MANGA -> res?.data?.user?.favourites?.manga?.nodes?.any { it.id == id } ?: false
+                ?: false
-            AnilistMutations.FavType.CHARACTER -> res?.data?.user?.favourites?.characters?.nodes?.any { it.id == id } ?: false
+
-            AnilistMutations.FavType.STAFF -> res?.data?.user?.favourites?.staff?.nodes?.any { it.id == id } ?: false
+            AnilistMutations.FavType.MANGA -> res?.data?.user?.favourites?.manga?.nodes?.any { it.id == id }
-            AnilistMutations.FavType.STUDIO -> res?.data?.user?.favourites?.studios?.nodes?.any { it.id == id } ?: false
+                ?: false
            AnilistMutations.FavType.CHARACTER -> res?.data?.user?.favourites?.characters?.nodes?.any { it.id == id }
                ?: false
            AnilistMutations.FavType.STAFF -> res?.data?.user?.favourites?.staff?.nodes?.any { it.id == id }
                ?: false
            AnilistMutations.FavType.STUDIO -> res?.data?.user?.favourites?.studios?.nodes?.any { it.id == id }
                ?: false
        }
    }
--- a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistViewModel.kt
+++ b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistViewModel.kt
@ -5,46 +5,34 @@ import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.lifecycleScope
 import ani.dantotsu.BuildConfig
 import ani.dantotsu.R
 import ani.dantotsu.connections.discord.Discord
 import ani.dantotsu.connections.mal.MAL
 import ani.dantotsu.media.Media
 import ani.dantotsu.others.AppUpdater
 import ani.dantotsu.profile.User
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.snackString
 import ani.dantotsu.tryWithSuspend
 import ani.dantotsu.util.Logger
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 suspend fun getUserId(context: Context, block: () -> Unit) {
-    CoroutineScope(Dispatchers.IO).launch {
+    if (!Anilist.initialized) {
        val token = PrefManager.getVal(PrefName.DiscordToken, null as String?)
        val userid = PrefManager.getVal(PrefName.DiscordId, null as String?)
        if (userid == null && token != null) {
            /*if (!Discord.getUserData())
                snackString(context.getString(R.string.error_loading_discord_user_data))*/
            //TODO: Discord.getUserData()
        }
    }
    val anilist = if (Anilist.userid == null && Anilist.token != null) {
        if (Anilist.query.getUserData()) {
            tryWithSuspend {
                if (MAL.token != null && !MAL.query.getUserData())
                    snackString(context.getString(R.string.error_loading_mal_user_data))
            }
            true
        } else {
            snackString(context.getString(R.string.error_loading_anilist_user_data))
            false
        }
-    } else true
+    }
-
+    block.invoke()
    if (anilist) block.invoke()
 }
 class AnilistHomeViewModel : ViewModel() {
@ -58,66 +46,75 @@ class AnilistHomeViewModel : ViewModel() {
        MutableLiveData<ArrayList<Media>>(null)
    fun getAnimeContinue(): LiveData<ArrayList<Media>> = animeContinue
    suspend fun setAnimeContinue() = animeContinue.postValue(Anilist.query.continueMedia("ANIME"))
    private val animeFav: MutableLiveData<ArrayList<Media>> =
        MutableLiveData<ArrayList<Media>>(null)
    fun getAnimeFav(): LiveData<ArrayList<Media>> = animeFav
    suspend fun setAnimeFav() = animeFav.postValue(Anilist.query.favMedia(true))
    private val animePlanned: MutableLiveData<ArrayList<Media>> =
        MutableLiveData<ArrayList<Media>>(null)
    fun getAnimePlanned(): LiveData<ArrayList<Media>> = animePlanned
    suspend fun setAnimePlanned() =
        animePlanned.postValue(Anilist.query.continueMedia("ANIME", true))
    private val mangaContinue: MutableLiveData<ArrayList<Media>> =
        MutableLiveData<ArrayList<Media>>(null)
    fun getMangaContinue(): LiveData<ArrayList<Media>> = mangaContinue
    suspend fun setMangaContinue() = mangaContinue.postValue(Anilist.query.continueMedia("MANGA"))
    private val mangaFav: MutableLiveData<ArrayList<Media>> =
        MutableLiveData<ArrayList<Media>>(null)
    fun getMangaFav(): LiveData<ArrayList<Media>> = mangaFav
    suspend fun setMangaFav() = mangaFav.postValue(Anilist.query.favMedia(false))
    private val mangaPlanned: MutableLiveData<ArrayList<Media>> =
        MutableLiveData<ArrayList<Media>>(null)
    fun getMangaPlanned(): LiveData<ArrayList<Media>> = mangaPlanned
    suspend fun setMangaPlanned() =
        mangaPlanned.postValue(Anilist.query.continueMedia("MANGA", true))
    private val recommendation: MutableLiveData<ArrayList<Media>> =
        MutableLiveData<ArrayList<Media>>(null)
    fun getRecommendation(): LiveData<ArrayList<Media>> = recommendation
    suspend fun setRecommendation() = recommendation.postValue(Anilist.query.recommendations())
    private val userStatus: MutableLiveData<ArrayList<User>> =
        MutableLiveData<ArrayList<User>>(null)
    fun getUserStatus(): LiveData<ArrayList<User>> = userStatus
    private val hidden: MutableLiveData<ArrayList<Media>> =
        MutableLiveData<ArrayList<Media>>(null)
    fun getHidden(): LiveData<ArrayList<Media>> = hidden
    @Suppress("UNCHECKED_CAST")
    suspend fun initHomePage() {
        val res = Anilist.query.initHomePage()
-        Logger.log("AnilistHomeViewModel : res=$res")
+        res["currentAnime"]?.let { animeContinue.postValue(it as ArrayList<Media>?) }
-        res["currentAnime"]?.let { animeContinue.postValue(it) }
+        res["favoriteAnime"]?.let { animeFav.postValue(it as ArrayList<Media>?) }
-        res["favoriteAnime"]?.let { animeFav.postValue(it) }
+        res["plannedAnime"]?.let { animePlanned.postValue(it as ArrayList<Media>?) }
-        res["plannedAnime"]?.let { animePlanned.postValue(it) }
+        res["currentManga"]?.let { mangaContinue.postValue(it as ArrayList<Media>?) }
-        res["currentManga"]?.let { mangaContinue.postValue(it) }
+        res["favoriteManga"]?.let { mangaFav.postValue(it as ArrayList<Media>?) }
-        res["favoriteManga"]?.let { mangaFav.postValue(it) }
+        res["plannedManga"]?.let { mangaPlanned.postValue(it as ArrayList<Media>?) }
-        res["plannedManga"]?.let { mangaPlanned.postValue(it) }
+        res["recommendations"]?.let { recommendation.postValue(it as ArrayList<Media>?) }
-        res["recommendations"]?.let { recommendation.postValue(it) }
+        res["hidden"]?.let { hidden.postValue(it as ArrayList<Media>?) }
        res["status"]?.let { userStatus.postValue(it as ArrayList<User>?) }
    }
    suspend fun loadMain(context: FragmentActivity) {
        Anilist.getSavedToken()
-        MAL.getSavedToken(context)
+        MAL.getSavedToken()
-        Discord.getSavedToken(context)
+        Discord.getSavedToken()
        if (!BuildConfig.FLAVOR.contains("fdroid")) {
-            if (PrefManager.getVal(PrefName.CheckUpdate)) AppUpdater.check(context)
+            if (PrefManager.getVal(PrefName.CheckUpdate))
                context.lifecycleScope.launch(Dispatchers.IO) {
                    AppUpdater.check(context, false)
                }
        }
        val ret = Anilist.query.getGenresAndTags()
        withContext(Dispatchers.Main) {
            genres.value = ret
        }
        genres.postValue(Anilist.query.getGenresAndTags())
    }
    val empty = MutableLiveData<Boolean>(null)
@ -144,22 +141,19 @@ class AnilistAnimeViewModel : ViewModel() {
                sort = Anilist.sortBy[2],
                season = season,
                seasonYear = year,
-                hd = true
+                hd = true,
                adultOnly = PrefManager.getVal(PrefName.AdultOnly)
            )?.results
        )
    }
    private val updated: MutableLiveData<MutableList<Media>> =
        MutableLiveData<MutableList<Media>>(null)
    fun getUpdated(): LiveData<MutableList<Media>> = updated
    suspend fun loadUpdated() = updated.postValue(Anilist.query.recentlyUpdated())
    private val animePopular = MutableLiveData<SearchResults?>(null)
    fun getPopular(): LiveData<SearchResults?> = animePopular
    suspend fun loadPopular(
        type: String,
-        search_val: String? = null,
+        searchVal: String? = null,
        genres: ArrayList<String>? = null,
        sort: String = Anilist.sortBy[1],
        onList: Boolean = true,
@ -167,10 +161,11 @@ class AnilistAnimeViewModel : ViewModel() {
        animePopular.postValue(
            Anilist.query.search(
                type,
-                search = search_val,
+                search = searchVal,
                onList = if (onList) null else false,
                sort = sort,
-                genres = genres
+                genres = genres,
                adultOnly = PrefManager.getVal(PrefName.AdultOnly)
            )
        )
    }
@ -185,13 +180,43 @@ class AnilistAnimeViewModel : ViewModel() {
            r.sort,
            r.genres,
            r.tags,
            r.status,
            r.source,
            r.format,
            r.countryOfOrigin,
            r.isAdult,
-            r.onList
+            r.onList,
            adultOnly = PrefManager.getVal(PrefName.AdultOnly),
        )
    )
    var loaded: Boolean = false
    private val updated: MutableLiveData<MutableList<Media>> =
        MutableLiveData<MutableList<Media>>(null)
    fun getUpdated(): LiveData<MutableList<Media>> = updated
    private val popularMovies: MutableLiveData<MutableList<Media>> =
        MutableLiveData<MutableList<Media>>(null)
    fun getMovies(): LiveData<MutableList<Media>> = popularMovies
    private val topRatedAnime: MutableLiveData<MutableList<Media>> =
        MutableLiveData<MutableList<Media>>(null)
    fun getTopRated(): LiveData<MutableList<Media>> = topRatedAnime
    private val mostFavAnime: MutableLiveData<MutableList<Media>> =
        MutableLiveData<MutableList<Media>>(null)
    fun getMostFav(): LiveData<MutableList<Media>> = mostFavAnime
    suspend fun loadAll() {
        val list = Anilist.query.loadAnimeList()
        updated.postValue(list["recentUpdates"])
        popularMovies.postValue(list["trendingMovies"])
        topRatedAnime.postValue(list["topRated"])
        mostFavAnime.postValue(list["mostFav"])
    }
 }
 class AnilistMangaViewModel : ViewModel() {
@ -209,29 +234,17 @@ class AnilistMangaViewModel : ViewModel() {
                type,
                perPage = 10,
                sort = Anilist.sortBy[2],
-                hd = true
+                hd = true,
                adultOnly = PrefManager.getVal(PrefName.AdultOnly)
            )?.results
        )
    private val updated: MutableLiveData<MutableList<Media>> =
        MutableLiveData<MutableList<Media>>(null)
    fun getTrendingNovel(): LiveData<MutableList<Media>> = updated
    suspend fun loadTrendingNovel() =
        updated.postValue(
            Anilist.query.search(
                type,
                perPage = 10,
                sort = Anilist.sortBy[2],
                format = "NOVEL"
            )?.results
        )
    private val mangaPopular = MutableLiveData<SearchResults?>(null)
    fun getPopular(): LiveData<SearchResults?> = mangaPopular
    suspend fun loadPopular(
        type: String,
-        search_val: String? = null,
+        searchVal: String? = null,
        genres: ArrayList<String>? = null,
        sort: String = Anilist.sortBy[1],
        onList: Boolean = true,
@ -239,10 +252,11 @@ class AnilistMangaViewModel : ViewModel() {
        mangaPopular.postValue(
            Anilist.query.search(
                type,
-                search = search_val,
+                search = searchVal,
                onList = if (onList) null else false,
                sort = sort,
-                genres = genres
+                genres = genres,
                adultOnly = PrefManager.getVal(PrefName.AdultOnly)
            )
        )
    }
@ -257,17 +271,55 @@ class AnilistMangaViewModel : ViewModel() {
            r.sort,
            r.genres,
            r.tags,
            r.status,
            r.source,
            r.format,
            r.countryOfOrigin,
            r.isAdult,
            r.onList,
            r.excludedGenres,
            r.excludedTags,
            r.startYear,
            r.seasonYear,
-            r.season
+            r.season,
            adultOnly = PrefManager.getVal(PrefName.AdultOnly)
        )
    )
    var loaded: Boolean = false
    private val popularManga: MutableLiveData<MutableList<Media>> =
        MutableLiveData<MutableList<Media>>(null)
    fun getPopularManga(): LiveData<MutableList<Media>> = popularManga
    private val popularManhwa: MutableLiveData<MutableList<Media>> =
        MutableLiveData<MutableList<Media>>(null)
    fun getPopularManhwa(): LiveData<MutableList<Media>> = popularManhwa
    private val popularNovel: MutableLiveData<MutableList<Media>> =
        MutableLiveData<MutableList<Media>>(null)
    fun getPopularNovel(): LiveData<MutableList<Media>> = popularNovel
    private val topRatedManga: MutableLiveData<MutableList<Media>> =
        MutableLiveData<MutableList<Media>>(null)
    fun getTopRated(): LiveData<MutableList<Media>> = topRatedManga
    private val mostFavManga: MutableLiveData<MutableList<Media>> =
        MutableLiveData<MutableList<Media>>(null)
    fun getMostFav(): LiveData<MutableList<Media>> = mostFavManga
    suspend fun loadAll() {
        val list = Anilist.query.loadMangaList()
        popularManga.postValue(list["trendingManga"])
        popularManhwa.postValue(list["trendingManhwa"])
        popularNovel.postValue(list["trendingNovel"])
        topRatedManga.postValue(list["topRated"])
        mostFavManga.postValue(list["mostFav"])
    }
 }
 class AnilistSearch : ViewModel() {
@ -286,13 +338,17 @@ class AnilistSearch : ViewModel() {
            r.sort,
            r.genres,
            r.tags,
            r.status,
            r.source,
            r.format,
            r.countryOfOrigin,
            r.isAdult,
            r.onList,
            r.excludedGenres,
            r.excludedTags,
            r.startYear,
            r.seasonYear,
-            r.season
+            r.season,
        )
    )
@ -305,11 +361,15 @@ class AnilistSearch : ViewModel() {
            r.sort,
            r.genres,
            r.tags,
            r.status,
            r.source,
            r.format,
            r.countryOfOrigin,
            r.isAdult,
            r.onList,
            r.excludedGenres,
            r.excludedTags,
            r.startYear,
            r.seasonYear,
            r.season
        )
@ -347,11 +407,6 @@ class ProfileViewModel : ViewModel() {
    fun getAnimeFav(): LiveData<ArrayList<Media>> = animeFav
    private val listImages: MutableLiveData<ArrayList<String?>> =
        MutableLiveData<ArrayList<String?>>(arrayListOf())
    fun getListImages(): LiveData<ArrayList<String?>> = listImages
    suspend fun setData(id: Int) {
        val res = Anilist.query.initProfilePage(id)
        val mangaList = res?.data?.favoriteManga?.favourites?.manga?.edges?.mapNotNull {
@ -367,30 +422,11 @@ class ProfileViewModel : ViewModel() {
        }
        animeFav.postValue(ArrayList(animeList ?: arrayListOf()))
        val bannerImages = arrayListOf<String?>(null, null)
        val animeRandom = res?.data?.animeMediaList?.lists?.mapNotNull {
            it.entries?.mapNotNull { entry ->
                val imageUrl = entry.media?.bannerImage
                if (imageUrl != null && imageUrl != "null") imageUrl
                else null
            }
        }?.flatten()?.randomOrNull()
        bannerImages[0] = animeRandom
        val mangaRandom = res?.data?.mangaMediaList?.lists?.mapNotNull {
            it.entries?.mapNotNull { entry ->
                val imageUrl = entry.media?.bannerImage
                if (imageUrl != null && imageUrl != "null") imageUrl
                else null
            }
        }?.flatten()?.randomOrNull()
        bannerImages[1] = mangaRandom
        listImages.postValue(bannerImages)
    }
    fun refresh() {
        mangaFav.postValue(mangaFav.value)
        animeFav.postValue(animeFav.value)
-        listImages.postValue(listImages.value)
+
    }
 }
--- a/app/src/main/java/ani/dantotsu/connections/anilist/Login.kt
+++ b/app/src/main/java/ani/dantotsu/connections/anilist/Login.kt
@ -4,7 +4,6 @@ import android.net.Uri
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import ani.dantotsu.logError
 import ani.dantotsu.util.Logger
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.startMainActivity
--- a/app/src/main/java/ani/dantotsu/connections/anilist/SearchResults.kt
+++ b/app/src/main/java/ani/dantotsu/connections/anilist/SearchResults.kt
@ -11,13 +11,17 @@ data class SearchResults(
    var onList: Boolean? = null,
    var perPage: Int? = null,
    var search: String? = null,
    var countryOfOrigin: String? = null,
    var sort: String? = null,
    var genres: MutableList<String>? = null,
    var excludedGenres: MutableList<String>? = null,
    var tags: MutableList<String>? = null,
    var excludedTags: MutableList<String>? = null,
    var status: String? = null,
    var source: String? = null,
    var format: String? = null,
    var seasonYear: Int? = null,
    var startYear: Int? = null,
    var season: String? = null,
    var page: Int = 1,
    var results: MutableList<Media>,
@ -37,12 +41,24 @@ data class SearchResults(
                )
            )
        }
        status?.let {
            list.add(SearchChip("STATUS", currContext()!!.getString(R.string.filter_status, it)))
        }
        source?.let {
            list.add(SearchChip("SOURCE", currContext()!!.getString(R.string.filter_source, it)))
        }
        format?.let {
            list.add(SearchChip("FORMAT", currContext()!!.getString(R.string.filter_format, it)))
        }
        countryOfOrigin?.let {
            list.add(SearchChip("COUNTRY", currContext()!!.getString(R.string.filter_country, it)))
        }
        season?.let {
            list.add(SearchChip("SEASON", it))
        }
        startYear?.let {
            list.add(SearchChip("START_YEAR", it.toString()))
        }
        seasonYear?.let {
            list.add(SearchChip("SEASON_YEAR", it.toString()))
        }
@ -74,8 +90,12 @@ data class SearchResults(
    fun removeChip(chip: SearchChip) {
        when (chip.type) {
            "SORT" -> sort = null
            "STATUS" -> status = null
            "SOURCE" -> source = null
            "FORMAT" -> format = null
            "COUNTRY" -> countryOfOrigin = null
            "SEASON" -> season = null
            "START_YEAR" -> startYear = null
            "SEASON_YEAR" -> seasonYear = null
            "GENRE" -> genres?.remove(chip.text)
            "EXCLUDED_GENRE" -> excludedGenres?.remove(chip.text)
--- a/app/src/main/java/ani/dantotsu/connections/anilist/api/Character.kt
+++ b/app/src/main/java/ani/dantotsu/connections/anilist/api/Character.kt
@ -55,7 +55,7 @@ data class CharacterConnection(
    @SerialName("nodes") var nodes: List<Character>?,
    // The pagination information
-    // @SerialName("pageInfo") var pageInfo: PageInfo?,
+    @SerialName("pageInfo") var pageInfo: PageInfo?,
 ) : java.io.Serializable
@Serializable
@ -72,7 +72,7 @@ data class CharacterEdge(
    @SerialName("name") var name: String?,
    // The voice actors of the character
-    // @SerialName("voiceActors") var voiceActors: List<Staff>?,
+    @SerialName("voiceActors") var voiceActors: List<Staff>?,
    // The voice actors of the character with role date
    // @SerialName("voiceActorRoles") var voiceActorRoles: List<StaffRoleType>?,
--- a/app/src/main/java/ani/dantotsu/connections/anilist/api/Data.kt
+++ b/app/src/main/java/ani/dantotsu/connections/anilist/api/Data.kt
@ -24,7 +24,9 @@ class Query {
        @Serializable
        data class Data(
            @SerialName("Media")
-            val media: ani.dantotsu.connections.anilist.api.Media?
+            val media: ani.dantotsu.connections.anilist.api.Media?,
            @SerialName("Page")
            val page: ani.dantotsu.connections.anilist.api.Page?
        )
    }
@ -136,6 +138,8 @@ class Query {
            @SerialName("recommendationQuery") val recommendationQuery: ani.dantotsu.connections.anilist.api.Page?,
            @SerialName("recommendationPlannedQueryAnime") val recommendationPlannedQueryAnime: ani.dantotsu.connections.anilist.api.MediaListCollection?,
            @SerialName("recommendationPlannedQueryManga") val recommendationPlannedQueryManga: ani.dantotsu.connections.anilist.api.MediaListCollection?,
            @SerialName("Page1") val page1: ActivityPage?,
            @SerialName("Page2") val page2: ActivityPage?
        )
    }
@ -147,9 +151,45 @@ class Query {
        @Serializable
        data class Data(
            @SerialName("favoriteAnime") val favoriteAnime: ani.dantotsu.connections.anilist.api.User?,
-            @SerialName("favoriteManga") val favoriteManga: ani.dantotsu.connections.anilist.api.User?,
+            @SerialName("favoriteManga") val favoriteManga: ani.dantotsu.connections.anilist.api.User?
-            @SerialName("animeMediaList") val animeMediaList: ani.dantotsu.connections.anilist.api.MediaListCollection?,
+        )
-            @SerialName("mangaMediaList") val mangaMediaList: ani.dantotsu.connections.anilist.api.MediaListCollection?
+    }
    @Serializable
    data class AnimeList(
        @SerialName("data")
        val data: Data?
    ) {
        @Serializable
        data class Data(
            @SerialName("recentUpdates") val recentUpdates: ani.dantotsu.connections.anilist.api.Page?,
            @SerialName("recentUpdates2") val recentUpdates2: ani.dantotsu.connections.anilist.api.Page?,
            @SerialName("trendingMovies") val trendingMovies: ani.dantotsu.connections.anilist.api.Page?,
            @SerialName("trendingMovies2") val trendingMovies2: ani.dantotsu.connections.anilist.api.Page?,
            @SerialName("topRated") val topRated: ani.dantotsu.connections.anilist.api.Page?,
            @SerialName("topRated2") val topRated2: ani.dantotsu.connections.anilist.api.Page?,
            @SerialName("mostFav") val mostFav: ani.dantotsu.connections.anilist.api.Page?,
            @SerialName("mostFav2") val mostFav2: ani.dantotsu.connections.anilist.api.Page?,
        )
    }
    @Serializable
    data class MangaList(
        @SerialName("data")
        val data: Data?
    ) {
        @Serializable
        data class Data(
            @SerialName("trendingManga") val trendingManga: ani.dantotsu.connections.anilist.api.Page?,
            @SerialName("trendingManga2") val trendingManga2: ani.dantotsu.connections.anilist.api.Page?,
            @SerialName("trendingManhwa") val trendingManhwa: ani.dantotsu.connections.anilist.api.Page?,
            @SerialName("trendingManhwa2") val trendingManhwa2: ani.dantotsu.connections.anilist.api.Page?,
            @SerialName("trendingNovel") val trendingNovel: ani.dantotsu.connections.anilist.api.Page?,
            @SerialName("trendingNovel2") val trendingNovel2: ani.dantotsu.connections.anilist.api.Page?,
            @SerialName("topRated") val topRated: ani.dantotsu.connections.anilist.api.Page?,
            @SerialName("topRated2") val topRated2: ani.dantotsu.connections.anilist.api.Page?,
            @SerialName("mostFav") val mostFav: ani.dantotsu.connections.anilist.api.Page?,
            @SerialName("mostFav2") val mostFav2: ani.dantotsu.connections.anilist.api.Page?,
        )
    }
@ -259,6 +299,70 @@ class Query {
        val following: List<ani.dantotsu.connections.anilist.api.User>?
    ) : java.io.Serializable
    @Serializable
    data class ReviewsResponse(
        @SerialName("data")
        val data: Data
    ) : java.io.Serializable {
        @Serializable
        data class Data(
            @SerialName("Page")
            val page: ReviewPage?
        ) : java.io.Serializable
    }
    @Serializable
    data class ReviewPage(
        @SerialName("pageInfo")
        val pageInfo: PageInfo,
        @SerialName("reviews")
        val reviews: List<Review>?
    ) : java.io.Serializable
    @Serializable
    data class RateReviewResponse(
        @SerialName("data")
        val data: Data
    ) : java.io.Serializable {
        @Serializable
        data class Data(
            @SerialName("RateReview")
            val rateReview: Review
        ) : java.io.Serializable
    }
    @Serializable
    data class Review(
        @SerialName("id")
        val id: Int,
        @SerialName("mediaId")
        val mediaId: Int,
        @SerialName("mediaType")
        val mediaType: String,
        @SerialName("summary")
        val summary: String,
        @SerialName("body")
        val body: String,
        @SerialName("rating")
        var rating: Int,
        @SerialName("ratingAmount")
        var ratingAmount: Int,
        @SerialName("userRating")
        var userRating: String,
        @SerialName("score")
        val score: Int,
        @SerialName("private")
        val private: Boolean,
        @SerialName("siteUrl")
        val siteUrl: String,
        @SerialName("createdAt")
        val createdAt: Int,
        @SerialName("updatedAt")
        val updatedAt: Int?,
        @SerialName("user")
        val user: ani.dantotsu.connections.anilist.api.User?,
    ) : java.io.Serializable
    @Serializable
    data class UserProfile(
        @SerialName("id")
@ -283,13 +387,13 @@ class Query {
        val statistics: NNUserStatisticTypes,
        @SerialName("siteUrl")
        val siteUrl: String,
-    ): java.io.Serializable
+    ) : java.io.Serializable
    @Serializable
    data class NNUserStatisticTypes(
        @SerialName("anime") var anime: NNUserStatistics,
        @SerialName("manga") var manga: NNUserStatistics
-    ): java.io.Serializable
+    ) : java.io.Serializable
    @Serializable
    data class NNUserStatistics(
@ -300,7 +404,7 @@ class Query {
        @SerialName("episodesWatched") var episodesWatched: Int,
        @SerialName("chaptersRead") var chaptersRead: Int,
        @SerialName("volumesRead") var volumesRead: Int,
-    ): java.io.Serializable
+    ) : java.io.Serializable
    @Serializable
    data class UserFavourites(
@ -314,13 +418,13 @@ class Query {
        val staff: UserStaffFavouritesCollection,
        @SerialName("studios")
        val studios: UserStudioFavouritesCollection,
-    ): java.io.Serializable
+    ) : java.io.Serializable
    @Serializable
    data class UserMediaFavouritesCollection(
        @SerialName("nodes")
        val nodes: List<UserMediaImageFavorite>,
-    ): java.io.Serializable
+    ) : java.io.Serializable
    @Serializable
    data class UserMediaImageFavorite(
@ -328,13 +432,13 @@ class Query {
        val id: Int,
        @SerialName("coverImage")
        val coverImage: MediaCoverImage
-    ): java.io.Serializable
+    ) : java.io.Serializable
    @Serializable
    data class UserCharacterFavouritesCollection(
        @SerialName("nodes")
        val nodes: List<UserCharacterImageFavorite>,
-    ): java.io.Serializable
+    ) : java.io.Serializable
    @Serializable
    data class UserCharacterImageFavorite(
@ -346,19 +450,19 @@ class Query {
        val image: CharacterImage,
        @SerialName("isFavourite")
        val isFavourite: Boolean
-    ): java.io.Serializable
+    ) : java.io.Serializable
    @Serializable
    data class UserStaffFavouritesCollection(
        @SerialName("nodes")
        val nodes: List<UserCharacterImageFavorite>, //downstream it's the same as character
-    ): java.io.Serializable
+    ) : java.io.Serializable
    @Serializable
    data class UserStudioFavouritesCollection(
        @SerialName("nodes")
        val nodes: List<UserStudioFavorite>,
-    ): java.io.Serializable
+    ) : java.io.Serializable
    @Serializable
    data class UserStudioFavorite(
@ -366,7 +470,7 @@ class Query {
        val id: Int,
        @SerialName("name")
        val name: String,
-    ): java.io.Serializable
+    ) : java.io.Serializable
    //----------------------------------------
    // Statistics
@ -375,12 +479,12 @@ class Query {
    data class StatisticsResponse(
        @SerialName("data")
        val data: Data
-    ): java.io.Serializable {
+    ) : java.io.Serializable {
        @Serializable
        data class Data(
            @SerialName("User")
            val user: StatisticsUser?
-        ): java.io.Serializable
+        ) : java.io.Serializable
    }
    @Serializable
--- a/app/src/main/java/ani/dantotsu/connections/anilist/api/Feed.kt
+++ b/app/src/main/java/ani/dantotsu/connections/anilist/api/Feed.kt
@ -14,7 +14,6 @@ data class FeedResponse(
        val page: ActivityPage
    ) : java.io.Serializable
 }
@Serializable
 data class ActivityPage(
    @SerialName("activities")
@ -36,7 +35,7 @@ data class Activity(
    @SerialName("type")
    val type: String,
    @SerialName("replyCount")
-    val replyCount: Int,
+    val replyCount: Int = 0,
    @SerialName("status")
    val status: String?,
    @SerialName("progress")
@ -48,9 +47,9 @@ data class Activity(
    @SerialName("siteUrl")
    val siteUrl: String?,
    @SerialName("isLocked")
-    val isLocked: Boolean,
+    val isLocked: Boolean?,
    @SerialName("isSubscribed")
-    val isSubscribed: Boolean,
+    val isSubscribed: Boolean?,
    @SerialName("likeCount")
    var likeCount: Int?,
    @SerialName("isLiked")
@ -75,6 +74,24 @@ data class Activity(
    val likes: List<User>?,
 ) : java.io.Serializable
@Serializable
 data class ReplyResponse(
    @SerialName("data")
    val data: Data
 ) : java.io.Serializable {
    @Serializable
    data class Data(
        @SerialName("Page")
        val page: ReplyPage
    ) : java.io.Serializable
 }
@Serializable
 data class ReplyPage(
    @SerialName("activityReplies")
    val activityReplies: List<ActivityReply>
 ) : java.io.Serializable
@Serializable
 data class ActivityReply(
    @SerialName("id")
@ -84,9 +101,9 @@ data class ActivityReply(
    @SerialName("text")
    val text: String,
    @SerialName("likeCount")
-    val likeCount: Int,
+    var likeCount: Int,
    @SerialName("isLiked")
-    val isLiked: Boolean,
+    var isLiked: Boolean,
    @SerialName("createdAt")
    val createdAt: Int,
    @SerialName("user")
--- a/app/src/main/java/ani/dantotsu/connections/anilist/api/Media.kt
+++ b/app/src/main/java/ani/dantotsu/connections/anilist/api/Media.kt
@ -152,7 +152,7 @@ data class Media(
    @SerialName("mediaListEntry") var mediaListEntry: MediaList?,
    // User reviews of the media
-    // @SerialName("reviews") var reviews: ReviewConnection?,
+    @SerialName("reviews") var reviews: ReviewConnection?,
    // User recommendations for similar media
    @SerialName("recommendations") var recommendations: RecommendationConnection?,
@ -174,7 +174,7 @@ data class Media(
    // Notes for site moderators
    @SerialName("modNotes") var modNotes: String?,
-)
+) : java.io.Serializable
@Serializable
 data class MediaTitle(
@ -189,7 +189,7 @@ data class MediaTitle(
    // The currently authenticated users preferred title language. Default romaji for non-authenticated
    @SerialName("userPreferred") var userPreferred: String,
-)
+): java.io.Serializable
@Serializable
 enum class MediaType {
@ -205,15 +205,17 @@ enum class MediaStatus {
    FINISHED, RELEASING, NOT_YET_RELEASED, CANCELLED, HIATUS;
    override fun toString(): String {
        currContext()?.let {
            return when (super.toString()) {
-            "FINISHED" -> currContext()!!.getString(R.string.status_finished)
+                "FINISHED" -> it.getString(R.string.status_finished)
-            "RELEASING" -> currContext()!!.getString(R.string.status_releasing)
+                "RELEASING" -> it.getString(R.string.status_releasing)
-            "NOT_YET_RELEASED" -> currContext()!!.getString(R.string.status_not_yet_released)
+                "NOT_YET_RELEASED" -> it.getString(R.string.status_not_yet_released)
-            "CANCELLED" -> currContext()!!.getString(R.string.status_cancelled)
+                "CANCELLED" -> it.getString(R.string.status_cancelled)
-            "HIATUS" -> currContext()!!.getString(R.string.status_hiatus)
+                "HIATUS" -> it.getString(R.string.status_hiatus)
                else -> ""
            }
-
+        }
        return super.toString().replace("_", " ")
    }
 }
@ -445,18 +447,21 @@ enum class MediaRelation {
    ADAPTATION, PREQUEL, SEQUEL, PARENT, SIDE_STORY, CHARACTER, SUMMARY, ALTERNATIVE, SPIN_OFF, OTHER, SOURCE, COMPILATION, CONTAINS;
    override fun toString(): String {
        currContext()?.let {
            return when (super.toString()) {
-            "ADAPTATION" -> currContext()!!.getString(R.string.type_adaptation)
+                "ADAPTATION" -> it.getString(R.string.type_adaptation)
-            "PARENT" -> currContext()!!.getString(R.string.type_parent)
+                "PARENT" -> it.getString(R.string.type_parent)
-            "CHARACTER" -> currContext()!!.getString(R.string.type_character)
+                "CHARACTER" -> it.getString(R.string.type_character)
-            "SUMMARY" -> currContext()!!.getString(R.string.type_summary)
+                "SUMMARY" -> it.getString(R.string.type_summary)
-            "ALTERNATIVE" -> currContext()!!.getString(R.string.type_alternative)
+                "ALTERNATIVE" -> it.getString(R.string.type_alternative)
-            "OTHER" -> currContext()!!.getString(R.string.type_other)
+                "OTHER" -> it.getString(R.string.type_other)
-            "SOURCE" -> currContext()!!.getString(R.string.type_source)
+                "SOURCE" -> it.getString(R.string.type_source)
-            "CONTAINS" -> currContext()!!.getString(R.string.type_contains)
+                "CONTAINS" -> it.getString(R.string.type_contains)
                else -> super.toString().replace("_", " ")
            }
        }
        return super.toString().replace("_", " ")
    }
 }
@Serializable
@ -533,3 +538,8 @@ data class MediaListGroup(
    @SerialName("status") var status: MediaListStatus?,
 ) : java.io.Serializable
@Serializable
 data class ReviewConnection(
    @SerialName("nodes") var nodes: List<Query.Review>?,
 )
--- a/app/src/main/java/ani/dantotsu/connections/anilist/api/Notification.kt
+++ b/app/src/main/java/ani/dantotsu/connections/anilist/api/Notification.kt
@ -2,6 +2,7 @@ package ani.dantotsu.connections.anilist.api
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import java.util.Locale
 enum class NotificationType(val value: String) {
    ACTIVITY_MESSAGE("ACTIVITY_MESSAGE"),
@ -21,8 +22,23 @@ enum class NotificationType(val value: String) {
    MEDIA_DATA_CHANGE("MEDIA_DATA_CHANGE"),
    MEDIA_MERGE("MEDIA_MERGE"),
    MEDIA_DELETION("MEDIA_DELETION"),
    //custom
    COMMENT_REPLY("COMMENT_REPLY"),
    COMMENT_WARNING("COMMENT_WARNING"),
    DANTOTSU_UPDATE("DANTOTSU_UPDATE"),
    SUBSCRIPTION("SUBSCRIPTION");
    fun toFormattedString(): String {
        return this.value.replace("_", " ").lowercase(Locale.ROOT)
            .replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.ROOT) else it.toString() }
    }
    companion object {
        fun String.fromFormattedString(): String {
            return this.replace(" ", "_").uppercase(Locale.ROOT)
        }
    }
 }
@Serializable
@ -84,9 +100,9 @@ data class Notification(
    @SerialName("createdAt")
    val createdAt: Int,
    @SerialName("media")
-    val media: ani.dantotsu.connections.anilist.api.Media? = null,
+    val media: Media? = null,
    @SerialName("user")
-    val user: ani.dantotsu.connections.anilist.api.User? = null,
+    val user: User? = null,
    @SerialName("message")
    val message: MessageActivity? = null,
    @SerialName("activity")
@ -95,6 +111,8 @@ data class Notification(
    val thread: Thread? = null,
    @SerialName("comment")
    val comment: ThreadComment? = null,
    val image: String? = null,
    val banner: String? = null,
 ) : java.io.Serializable
@Serializable
--- a/app/src/main/java/ani/dantotsu/connections/anilist/api/Staff.kt
+++ b/app/src/main/java/ani/dantotsu/connections/anilist/api/Staff.kt
@ -93,6 +93,7 @@ data class StaffConnection(
    // The pagination information
    // @SerialName("pageInfo") var pageInfo: PageInfo?,
 )
@Serializable
 data class StaffImage(
    // The character's image of media at its largest size
@ -101,6 +102,7 @@ data class StaffImage(
    // The character's image of media at medium size
    @SerialName("medium") var medium: String?,
 ) : java.io.Serializable
@Serializable
 data class StaffEdge(
    var role: String?,
--- a/app/src/main/java/ani/dantotsu/connections/anilist/api/User.kt
+++ b/app/src/main/java/ani/dantotsu/connections/anilist/api/User.kt
@ -69,7 +69,7 @@ data class User(
    // The user's previously used names.
    // @SerialName("previousNames") var previousNames: List<UserPreviousName>?,
-)
+): java.io.Serializable
@Serializable
 data class UserOptions(
@ -111,7 +111,7 @@ data class UserAvatar(
    // The avatar of user at medium size
    @SerialName("medium") var medium: String?,
-): java.io.Serializable
+) : java.io.Serializable
@Serializable
 data class UserStatisticTypes(
--- a/app/src/main/java/ani/dantotsu/connections/bakaupdates/MangaUpdates.kt
+++ b/app/src/main/java/ani/dantotsu/connections/bakaupdates/MangaUpdates.kt
@ -0,0 +1,133 @@
 package ani.dantotsu.connections.bakaupdates
 import android.content.Context
 import ani.dantotsu.R
 import ani.dantotsu.client
 import ani.dantotsu.connections.anilist.api.FuzzyDate
 import ani.dantotsu.tryWithSuspend
 import ani.dantotsu.util.Logger
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import okio.ByteString.Companion.encode
 import org.json.JSONException
 import org.json.JSONObject
 import java.nio.charset.Charset
 class MangaUpdates {
    private val Int?.dateFormat get() = String.format("%02d", this)
    private val apiUrl = "https://api.mangaupdates.com/v1/releases/search"
    suspend fun search(title: String, startDate: FuzzyDate?): MangaUpdatesResponse.Results? {
        return tryWithSuspend {
            val query = JSONObject().apply {
                try {
                    put("search", title.encode(Charset.forName("UTF-8")))
                    startDate?.let {
                        put(
                            "start_date",
                            "${it.year}-${it.month.dateFormat}-${it.day.dateFormat}"
                        )
                    }
                    put("include_metadata", true)
                } catch (e: JSONException) {
                    e.printStackTrace()
                }
            }
            val res = try {
                client.post(apiUrl, json = query).parsed<MangaUpdatesResponse>()
            } catch (e: Exception) {
                Logger.log(e.toString())
                return@tryWithSuspend null
            }
            coroutineScope {
                res.results?.map {
                    async(Dispatchers.IO) {
                        Logger.log(it.toString())
                    }
                }
            }?.awaitAll()
            res.results?.first {
                it.metadata.series.lastUpdated?.timestamp != null
                        && (it.metadata.series.latestChapter != null
                        || (it.record.volume.isNullOrBlank() && it.record.chapter != null))
            }
        }
    }
    companion object {
        fun getLatestChapter(context: Context, results: MangaUpdatesResponse.Results): String {
            return results.metadata.series.latestChapter?.let {
                context.getString(R.string.chapter_number, it)
            } ?: results.record.chapter!!.substringAfterLast("-").trim().let { chapter ->
                chapter.takeIf {
                    it.toIntOrNull() == null
                } ?: context.getString(R.string.chapter_number, chapter.toInt())
            }
        }
    }
    @Serializable
    data class MangaUpdatesResponse(
        @SerialName("total_hits")
        val totalHits: Int?,
        @SerialName("page")
        val page: Int?,
        @SerialName("per_page")
        val perPage: Int?,
        val results: List<Results>? = null
    ) {
        @Serializable
        data class Results(
            val record: Record,
            val metadata: MetaData
        ) {
            @Serializable
            data class Record(
                @SerialName("id")
                val id: Int,
                @SerialName("title")
                val title: String,
                @SerialName("volume")
                val volume: String?,
                @SerialName("chapter")
                val chapter: String?,
                @SerialName("release_date")
                val releaseDate: String
            )
            @Serializable
            data class MetaData(
                val series: Series
            ) {
                @Serializable
                data class Series(
                    @SerialName("series_id")
                    val seriesId: Long?,
                    @SerialName("title")
                    val title: String?,
                    @SerialName("latest_chapter")
                    val latestChapter: Int?,
                    @SerialName("last_updated")
                    val lastUpdated: LastUpdated?
                ) {
                    @Serializable
                    data class LastUpdated(
                        @SerialName("timestamp")
                        val timestamp: Long,
                        @SerialName("as_rfc3339")
                        val asRfc3339: String,
                        @SerialName("as_string")
                        val asString: String
                    )
                }
            }
        }
    }
 }
--- a/app/src/main/java/ani/dantotsu/connections/comments/CommentsAPI.kt
+++ b/app/src/main/java/ani/dantotsu/connections/comments/CommentsAPI.kt
@ -1,10 +1,13 @@
 package ani.dantotsu.connections.comments
 import android.content.Context
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.isOnline
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.snackString
 import ani.dantotsu.toast
 import ani.dantotsu.util.Logger
 import com.lagradost.nicehttp.NiceResponse
 import com.lagradost.nicehttp.Requests
 import eu.kanade.tachiyomi.network.NetworkHelper
@ -24,7 +27,8 @@ import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 object CommentsAPI {
-    val address: String = "https://1224665.xyz:443"
+    private const val ADDRESS: String = "https://api.dantotsu.app"
    private var isOnline: Boolean = true
    var authToken: String? = null
    var userId: String? = null
    var isBanned: Boolean = false
@ -32,8 +36,13 @@ object CommentsAPI {
    var isMod: Boolean = false
    var totalVotes: Int = 0
-    suspend fun getCommentsForId(id: Int, page: Int = 1, tag: Int?, sort: String?): CommentResponse? {
+    suspend fun getCommentsForId(
-        var url = "$address/comments/$id/$page"
+        id: Int,
        page: Int = 1,
        tag: Int?,
        sort: String?
    ): CommentResponse? {
        var url = "$ADDRESS/comments/$id/$page"
        val request = requestBuilder()
        tag?.let {
            url += "?tag=$it"
@ -44,7 +53,8 @@ object CommentsAPI {
        val json = try {
            request.get(url)
        } catch (e: IOException) {
-            snackString("Failed to fetch comments")
+            Logger.log(e)
            errorMessage("Failed to fetch comments")
            return null
        }
        if (!json.text.startsWith("{")) return null
@ -61,12 +71,13 @@ object CommentsAPI {
    }
    suspend fun getRepliesFromId(id: Int, page: Int = 1): CommentResponse? {
-        val url = "$address/comments/parent/$id/$page"
+        val url = "$ADDRESS/comments/parent/$id/$page"
        val request = requestBuilder()
        val json = try {
            request.get(url)
        } catch (e: IOException) {
-            snackString("Failed to fetch comments")
+            Logger.log(e)
            errorMessage("Failed to fetch comments")
            return null
        }
        if (!json.text.startsWith("{")) return null
@ -83,12 +94,13 @@ object CommentsAPI {
    }
    suspend fun getSingleComment(id: Int): Comment? {
-        val url = "$address/comments/$id"
+        val url = "$ADDRESS/comments/$id"
        val request = requestBuilder()
        val json = try {
            request.get(url)
        } catch (e: IOException) {
-            snackString("Failed to fetch comment")
+            Logger.log(e)
            errorMessage("Failed to fetch comment")
            return null
        }
        if (!json.text.startsWith("{")) return null
@ -105,12 +117,13 @@ object CommentsAPI {
    }
    suspend fun vote(commentId: Int, voteType: Int): Boolean {
-        val url = "$address/comments/vote/$commentId/$voteType"
+        val url = "$ADDRESS/comments/vote/$commentId/$voteType"
        val request = requestBuilder()
        val json = try {
            request.post(url)
        } catch (e: IOException) {
-            snackString("Failed to vote")
+            Logger.log(e)
            errorMessage("Failed to vote")
            return false
        }
        val res = json.code == 200
@ -121,7 +134,7 @@ object CommentsAPI {
    }
    suspend fun comment(mediaId: Int, parentCommentId: Int?, content: String, tag: Int?): Comment? {
-        val url = "$address/comments"
+        val url = "$ADDRESS/comments"
        val body = FormBody.Builder()
            .add("user_id", userId ?: return null)
            .add("media_id", mediaId.toString())
@ -136,7 +149,8 @@ object CommentsAPI {
        val json = try {
            request.post(url, requestBody = body.build())
        } catch (e: IOException) {
-            snackString("Failed to comment")
+            Logger.log(e)
            errorMessage("Failed to comment")
            return null
        }
        val res = json.code == 200
@ -147,7 +161,8 @@ object CommentsAPI {
        val parsed = try {
            Json.decodeFromString<ReturnedComment>(json.text)
        } catch (e: Exception) {
-            snackString("Failed to parse comment")
+            Logger.log(e)
            errorMessage("Failed to parse comment")
            return null
        }
        return Comment(
@ -169,12 +184,13 @@ object CommentsAPI {
    }
    suspend fun deleteComment(commentId: Int): Boolean {
-        val url = "$address/comments/$commentId"
+        val url = "$ADDRESS/comments/$commentId"
        val request = requestBuilder()
        val json = try {
            request.delete(url)
        } catch (e: IOException) {
-            snackString("Failed to delete comment")
+            Logger.log(e)
            errorMessage("Failed to delete comment")
            return false
        }
        val res = json.code == 200
@ -185,7 +201,7 @@ object CommentsAPI {
    }
    suspend fun editComment(commentId: Int, content: String): Boolean {
-        val url = "$address/comments/$commentId"
+        val url = "$ADDRESS/comments/$commentId"
        val body = FormBody.Builder()
            .add("content", content)
            .build()
@ -193,7 +209,8 @@ object CommentsAPI {
        val json = try {
            request.put(url, requestBody = body)
        } catch (e: IOException) {
-            snackString("Failed to edit comment")
+            Logger.log(e)
            errorMessage("Failed to edit comment")
            return false
        }
        val res = json.code == 200
@ -204,12 +221,13 @@ object CommentsAPI {
    }
    suspend fun banUser(userId: String): Boolean {
-        val url = "$address/ban/$userId"
+        val url = "$ADDRESS/ban/$userId"
        val request = requestBuilder()
        val json = try {
            request.post(url)
        } catch (e: IOException) {
-            snackString("Failed to ban user")
+            Logger.log(e)
            errorMessage("Failed to ban user")
            return false
        }
        val res = json.code == 200
@ -225,7 +243,7 @@ object CommentsAPI {
        mediaTitle: String,
        reportedId: String
    ): Boolean {
-        val url = "$address/report/$commentId"
+        val url = "$ADDRESS/report/$commentId"
        val body = FormBody.Builder()
            .add("username", username)
            .add("mediaName", mediaTitle)
@ -236,7 +254,8 @@ object CommentsAPI {
        val json = try {
            request.post(url, requestBody = body)
        } catch (e: IOException) {
-            snackString("Failed to report comment")
+            Logger.log(e)
            errorMessage("Failed to report comment")
            return false
        }
        val res = json.code == 200
@ -247,7 +266,7 @@ object CommentsAPI {
    }
    suspend fun getNotifications(client: OkHttpClient): NotificationResponse? {
-        val url = "$address/notification/reply"
+        val url = "$ADDRESS/notification/reply"
        val request = requestBuilder(client)
        val json = try {
            request.get(url)
@ -268,7 +287,7 @@ object CommentsAPI {
    }
    private suspend fun getUserDetails(client: OkHttpClient? = null): User? {
-        val url = "$address/user"
+        val url = "$ADDRESS/user"
        val request = if (client != null) requestBuilder(client) else requestBuilder()
        val json = try {
            request.get(url)
@ -291,7 +310,8 @@ object CommentsAPI {
        return null
    }
-    suspend fun fetchAuthToken(client: OkHttpClient? = null) {
+    suspend fun fetchAuthToken(context: Context, client: OkHttpClient? = null) {
        isOnline = isOnline(context)
        if (authToken != null) return
        val MAX_RETRIES = 5
        val tokenLifetime: Long = 1000 * 60 * 60 * 24 * 6 // 6 days
@ -310,7 +330,7 @@ object CommentsAPI {
            }
        }
-        val url = "$address/authenticate"
+        val url = "$ADDRESS/authenticate"
        val token = PrefManager.getVal(PrefName.AnilistToken, null as String?) ?: return
        repeat(MAX_RETRIES) {
            try {
@ -320,7 +340,8 @@ object CommentsAPI {
                    val parsed = try {
                        Json.decodeFromString<AuthResponse>(json.text)
                    } catch (e: Exception) {
-                        snackString("Failed to login to comments API: ${e.printStackTrace()}")
+                        Logger.log(e)
                        errorMessage("Failed to login to comments API: ${e.printStackTrace()}")
                        return
                    }
                    PrefManager.setVal(PrefName.CommentAuthResponse, parsed)
@ -340,12 +361,29 @@ object CommentsAPI {
                    return
                }
            } catch (e: IOException) {
-                snackString("Failed to login to comments API")
+                Logger.log(e)
                errorMessage("Failed to login to comments API")
                return
            }
            kotlinx.coroutines.delay(60000)
        }
-        snackString("Failed to login after multiple attempts")
+        errorMessage("Failed to login after multiple attempts")
    }
    private fun errorMessage(reason: String) {
        Logger.log(reason)
        if (isOnline) snackString(reason)
    }
    fun logout() {
        PrefManager.removeVal(PrefName.CommentAuthResponse)
        PrefManager.removeVal(PrefName.CommentTokenExpiry)
        authToken = null
        userId = null
        isBanned = false
        isAdmin = false
        isMod = false
        totalVotes = 0
    }
    private suspend fun authRequest(
@ -388,7 +426,7 @@ object CommentsAPI {
            null
        }
        val message = parsed?.message ?: reason ?: error
-        val fullMessage = if(code == 500) message else "$code: $message"
+        val fullMessage = if (code == 500) message else "$code: $message"
        toast(fullMessage)
    }
--- a/app/src/main/java/ani/dantotsu/connections/crashlytics/CrashlyticsStub.kt
+++ b/app/src/main/java/ani/dantotsu/connections/crashlytics/CrashlyticsStub.kt
@ -7,6 +7,7 @@ class CrashlyticsStub : CrashlyticsInterface {
    override fun initialize(context: Context) {
        //no-op
    }
    override fun logException(e: Throwable) {
        Logger.log(e)
    }
--- a/app/src/main/java/ani/dantotsu/connections/discord/Discord.kt
+++ b/app/src/main/java/ani/dantotsu/connections/discord/Discord.kt
@ -20,14 +20,14 @@ object Discord {
    var avatar: String? = null
-    fun getSavedToken(context: Context): Boolean {
+    fun getSavedToken(): Boolean {
        token = PrefManager.getVal(
            PrefName.DiscordToken, null as String?
        )
        return token != null
    }
-    fun saveToken(context: Context, token: String) {
+    fun saveToken(token: String) {
        PrefManager.setVal(PrefName.DiscordToken, token)
    }
@ -71,4 +71,6 @@ object Discord {
    const val application_Id = "1163925779692912771"
    const val small_Image: String =
        "mp:external/GJEe4hKzr8w56IW6ZKQz43HFVEo8pOtA_C-dJiWwxKo/https/cdn.discordapp.com/app-icons/1163925779692912771/f6b42d41dfdf0b56fcc79d4a12d2ac66.png"
    const val small_Image_AniList: String =
        "mp:external/rHOIjjChluqQtGyL_UHk6Z4oAqiVYlo_B7HSGPLSoUg/%3Fsize%3D128/https/cdn.discordapp.com/icons/210521487378087947/a_f54f910e2add364a3da3bb2f2fce0c72.webp"
 }
--- a/app/src/main/java/ani/dantotsu/connections/discord/DiscordService.kt
+++ b/app/src/main/java/ani/dantotsu/connections/discord/DiscordService.kt
@ -5,16 +5,12 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.app.Service
 import android.content.ContentValues
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.os.Environment
 import android.os.IBinder
 import android.os.PowerManager
 import android.provider.MediaStore
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@ -37,7 +33,6 @@ import okhttp3.Response
 import okhttp3.WebSocket
 import okhttp3.WebSocketListener
 import java.io.File
 import java.io.OutputStreamWriter
 class DiscordService : Service() {
    private var heartbeat: Int = 0
@ -49,6 +44,7 @@ class DiscordService : Service() {
    private lateinit var heartbeatThread: Thread
    private lateinit var client: OkHttpClient
    private lateinit var wakeLock: PowerManager.WakeLock
    private val shouldLog = false
    var presenceStore = ""
    val json = Json {
        encodeDefaults = true
@ -67,7 +63,7 @@ class DiscordService : Service() {
            PowerManager.PARTIAL_WAKE_LOCK,
            "discordRPC:backgroundPresence"
        )
-        wakeLock.acquire()
+        wakeLock.acquire(30 * 60 * 1000L /*30 minutes*/)
        log("WakeLock Acquired")
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            val serviceChannel = NotificationChannel(
@ -162,8 +158,8 @@ class DiscordService : Service() {
    inner class DiscordWebSocketListener : WebSocketListener() {
-        var retryAttempts = 0
+        private var retryAttempts = 0
-        val maxRetryAttempts = 10
+        private val maxRetryAttempts = 10
        override fun onOpen(webSocket: WebSocket, response: Response) {
            super.onOpen(webSocket, response)
            this@DiscordService.webSocket = webSocket
@ -232,7 +228,7 @@ class DiscordService : Service() {
                        resume()
                        resume = false
                    } else {
-                        identify(webSocket, baseContext)
+                        identify(webSocket)
                        log("WebSocket: Identified")
                    }
                }
@ -245,13 +241,13 @@ class DiscordService : Service() {
            }
        }
-        fun identify(webSocket: WebSocket, context: Context) {
+        private fun identify(webSocket: WebSocket) {
            val properties = JsonObject()
            properties.addProperty("os", "linux")
            properties.addProperty("browser", "unknown")
            properties.addProperty("device", "unknown")
            val d = JsonObject()
-            d.addProperty("token", getToken(context))
+            d.addProperty("token", getToken())
            d.addProperty("intents", 0)
            d.add("properties", properties)
            val payload = JsonObject()
@ -270,7 +266,7 @@ class DiscordService : Service() {
                retryAttempts++
                if (retryAttempts >= maxRetryAttempts) {
                    log("WebSocket: Error, onFailure() reason: Max Retry Attempts")
-                    errorNotification("Could not set the presence", "Max Retry Attempts")
+                    errorNotification("Timeout setting presence", "Max Retry Attempts")
                    return
                }
            }
@ -311,7 +307,7 @@ class DiscordService : Service() {
        }
    }
-    fun getToken(context: Context): String {
+    fun getToken(): String {
        val token = PrefManager.getVal(PrefName.DiscordToken, null as String?)
        return if (token == null) {
            log("WebSocket: Token not found")
@ -349,13 +345,13 @@ class DiscordService : Service() {
                Manifest.permission.POST_NOTIFICATIONS
            ) != PackageManager.PERMISSION_GRANTED
        ) {
            //TODO: Request permission
            return
        }
        notificationManager.notify(2, builder.build())
        log("Error Notified")
    }
    @Suppress("unused")
    fun saveSimpleTestPresence() {
        val file = File(baseContext.cacheDir, "payload")
        //fill with test payload
@ -375,20 +371,22 @@ class DiscordService : Service() {
        log("WebSocket: Simple Test Presence Saved")
    }
-    fun setPresence(String: String) {
+    fun setPresence(string: String) {
        log("WebSocket: Sending Presence payload")
-        log(String)
+        log(string)
-        webSocket.send(String)
+        webSocket.send(string)
    }
    fun log(string: String) {
-        //Logger.log(string)
+        if (shouldLog) {
            Logger.log(string)
        }
    }
    fun resume() {
        log("Sending Resume payload")
        val d = JsonObject()
-        d.addProperty("token", getToken(baseContext))
+        d.addProperty("token", getToken())
        d.addProperty("session_id", sessionId)
        d.addProperty("seq", sequence)
        val json = JsonObject()
@ -404,7 +402,7 @@ class DiscordService : Service() {
                Thread.sleep(heartbeat.toLong())
                heartbeatSend(webSocket, sequence)
                log("WebSocket: Heartbeat Sent")
-            } catch (e: InterruptedException) {
+            } catch (ignored: InterruptedException) {
            }
        }
    }
--- a/app/src/main/java/ani/dantotsu/connections/discord/Login.kt
+++ b/app/src/main/java/ani/dantotsu/connections/discord/Login.kt
@ -75,7 +75,7 @@ class Login : AppCompatActivity() {
        }
        Toast.makeText(this, "Logged in successfully", Toast.LENGTH_SHORT).show()
        finish()
-        saveToken(this, token)
+        saveToken(token)
        startMainActivity(this@Login)
    }
--- a/app/src/main/java/ani/dantotsu/connections/discord/RPC.kt
+++ b/app/src/main/java/ani/dantotsu/connections/discord/RPC.kt
@ -71,8 +71,8 @@ open class RPC(val token: String, val coroutineContext: CoroutineContext) {
                            assets = Activity.Assets(
                                largeImage = data.largeImage?.url?.discordUrl(),
                                largeText = data.largeImage?.label,
-                                smallImage = data.smallImage?.url?.discordUrl(),
+                                smallImage = if (PrefManager.getVal(PrefName.ShowAniListIcon)) Discord.small_Image_AniList.discordUrl() else Discord.small_Image.discordUrl(),
-                                smallText = data.smallImage?.label
+                                smallText = if (PrefManager.getVal(PrefName.ShowAniListIcon)) "Anilist" else "Dantotsu",
                            ),
                            buttons = data.buttons.map { it.label },
                            metadata = Activity.Metadata(
--- a/app/src/main/java/ani/dantotsu/connections/github/Contributors.kt
+++ b/app/src/main/java/ani/dantotsu/connections/github/Contributors.kt
@ -0,0 +1,114 @@
 package ani.dantotsu.connections.github
 import ani.dantotsu.Mapper
 import ani.dantotsu.R
 import ani.dantotsu.client
 import ani.dantotsu.getAppString
 import ani.dantotsu.settings.Developer
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.decodeFromJsonElement
 class Contributors {
    fun getContributors(): Array<Developer> {
        var developers = arrayOf<Developer>()
        runBlocking(Dispatchers.IO) {
            val repo = getAppString(R.string.repo)
            val res = client.get("https://api.github.com/repos/$repo/contributors")
                .parsed<JsonArray>().map {
                    Mapper.json.decodeFromJsonElement<GithubResponse>(it)
                }
            res.forEach {
                if (it.login == "SunglassJerry") return@forEach
                val role = when (it.login) {
                    "rebelonion" -> "Owner & Maintainer"
                    "sneazy-ibo" -> "Contributor & Comment Moderator"
                    "WaiWhat" -> "Icon Designer"
                    else -> "Contributor"
                }
                developers = developers.plus(
                    Developer(
                        it.login,
                        it.avatarUrl,
                        role,
                        it.htmlUrl
                    )
                )
            }
            developers = developers.plus(
                arrayOf(
                    Developer(
                        "MarshMeadow",
                        "https://avatars.githubusercontent.com/u/88599122?v=4",
                        "Beta Icon Designer & Website Maintainer",
                        "https://github.com/MarshMeadow?tab=repositories"
                    ),
                    Developer(
                        "Zaxx69",
                        "https://s4.anilist.co/file/anilistcdn/user/avatar/large/b6342562-kxE8m4i7KUMK.png",
                        "Telegram Admin",
                        "https://anilist.co/user/6342562"
                    ),
                    Developer(
                        "Arif Alam",
                        "https://s4.anilist.co/file/anilistcdn/user/avatar/large/b6011177-2n994qtayiR9.jpg",
                        "Discord & Comment Moderator",
                        "https://anilist.co/user/6011177"
                    ),
                    Developer(
                        "SunglassJeery",
                        "https://s4.anilist.co/file/anilistcdn/user/avatar/large/b5804776-FEKfP5wbz2xv.png",
                        "Head Discord & Comment Moderator",
                        "https://anilist.co/user/5804776"
                    ),
                    Developer(
                        "Excited",
                        "https://s4.anilist.co/file/anilistcdn/user/avatar/large/b6131921-toSoGWmKbRA1.png",
                        "Comment Moderator",
                        "https://anilist.co/user/6131921"
                    ),
                    Developer(
                        "Gurjshan",
                        "https://s4.anilist.co/file/anilistcdn/user/avatar/large/b6363228-rWQ3Pl3WuxzL.png",
                        "Comment Moderator",
                        "https://anilist.co/user/6363228"
                    ),
                    Developer(
                        "NekoMimi",
                        "https://s4.anilist.co/file/anilistcdn/user/avatar/large/b6244220-HOpImMGMQAxW.jpg",
                        "Comment Moderator",
                        "https://anilist.co/user/6244220"
                    ),
                    Developer(
                        "Ziadsenior",
                        "https://s4.anilist.co/file/anilistcdn/user/avatar/large/b6049773-8cjYeUOFUguv.jpg",
                        "Comment Moderator and Arabic Translator",
                        "https://anilist.co/user/6049773"
                    ),
                    Developer(
                        "hastsu",
                        "https://cdn.discordapp.com/avatars/602422545077108749/20b4a6efa4314550e4ed51cdbe4fef3d.webp?size=160",
                        "Comment Moderator and Arabic Translator",
                        "https://anilist.co/user/6183359"
                    ),
                )
            )
        }
        return developers
    }
    @Serializable
    data class GithubResponse(
        @SerialName("login")
        val login: String,
        @SerialName("avatar_url")
        val avatarUrl: String,
        @SerialName("html_url")
        val htmlUrl: String
    )
 }
--- a/app/src/main/java/ani/dantotsu/connections/mal/MAL.kt
+++ b/app/src/main/java/ani/dantotsu/connections/mal/MAL.kt
@ -5,7 +5,6 @@ import android.content.Context
 import android.net.Uri
 import android.util.Base64
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.fragment.app.FragmentActivity
 import ani.dantotsu.R
 import ani.dantotsu.client
 import ani.dantotsu.currContext
@ -64,7 +63,7 @@ object MAL {
    }
-    suspend fun getSavedToken(context: FragmentActivity): Boolean {
+    suspend fun getSavedToken(): Boolean {
        return tryWithSuspend(false) {
            var res: ResponseToken =
                PrefManager.getNullableVal<ResponseToken>(PrefName.MALToken, null)
@ -77,7 +76,7 @@ object MAL {
        } ?: false
    }
-    fun removeSavedToken(context: Context) {
+    fun removeSavedToken() {
        token = null
        username = null
        userid = null
--- a/app/src/main/java/ani/dantotsu/download/DownloadCompat.kt
+++ b/app/src/main/java/ani/dantotsu/download/DownloadCompat.kt
@ -0,0 +1,384 @@
 package ani.dantotsu.download
 import android.content.Context
 import android.net.Uri
 import android.os.Environment
 import android.widget.Toast
 import ani.dantotsu.R
 import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.currActivity
 import ani.dantotsu.currContext
 import ani.dantotsu.download.anime.OfflineAnimeModel
 import ani.dantotsu.download.manga.OfflineMangaModel
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaNameAdapter
 import ani.dantotsu.media.MediaType
 import ani.dantotsu.parsers.Episode
 import ani.dantotsu.parsers.MangaChapter
 import ani.dantotsu.parsers.MangaImage
 import ani.dantotsu.parsers.Subtitle
 import ani.dantotsu.parsers.SubtitleType
 import ani.dantotsu.util.Logger
 import com.google.gson.GsonBuilder
 import com.google.gson.InstanceCreator
 import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.SAnimeImpl
 import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.SEpisodeImpl
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SChapterImpl
 import eu.kanade.tachiyomi.source.model.SManga
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.File
 import java.util.Locale
@Deprecated("external storage is deprecated, use SAF instead")
 class DownloadCompat {
    companion object {
        @Deprecated("external storage is deprecated, use SAF instead")
        fun loadMediaCompat(downloadedType: DownloadedType): Media? {
            val type = when (downloadedType.type) {
                MediaType.MANGA -> "Manga"
                MediaType.ANIME -> "Anime"
                else -> "Novel"
            }
            val directory = File(
                currContext()?.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                "Dantotsu/$type/${downloadedType.titleName}"
            )
            //load media.json and convert to media class with gson
            return try {
                val gson = GsonBuilder()
                    .registerTypeAdapter(SChapter::class.java, InstanceCreator<SChapter> {
                        SChapterImpl() // Provide an instance of SChapterImpl
                    })
                    .registerTypeAdapter(SAnime::class.java, InstanceCreator<SAnime> {
                        SAnimeImpl() // Provide an instance of SAnimeImpl
                    })
                    .registerTypeAdapter(SEpisode::class.java, InstanceCreator<SEpisode> {
                        SEpisodeImpl() // Provide an instance of SEpisodeImpl
                    })
                    .create()
                val media = File(directory, "media.json")
                val mediaJson = media.readText()
                gson.fromJson(mediaJson, Media::class.java)
            } catch (e: Exception) {
                Logger.log("Error loading media.json: ${e.message}")
                Logger.log(e)
                Injekt.get<CrashlyticsInterface>().logException(e)
                null
            }
        }
        @Deprecated("external storage is deprecated, use SAF instead")
        fun loadOfflineAnimeModelCompat(downloadedType: DownloadedType): OfflineAnimeModel {
            val type = when (downloadedType.type) {
                MediaType.MANGA -> "Manga"
                MediaType.ANIME -> "Anime"
                else -> "Novel"
            }
            val directory = File(
                currContext()?.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                "Dantotsu/$type/${downloadedType.titleName}"
            )
            //load media.json and convert to media class with gson
            try {
                val mediaModel = loadMediaCompat(downloadedType)!!
                val cover = File(directory, "cover.jpg")
                val coverUri: Uri? = if (cover.exists()) {
                    Uri.fromFile(cover)
                } else null
                val banner = File(directory, "banner.jpg")
                val bannerUri: Uri? = if (banner.exists()) {
                    Uri.fromFile(banner)
                } else null
                val title = mediaModel.mainName()
                val score = ((if (mediaModel.userScore == 0) (mediaModel.meanScore
                    ?: 0) else mediaModel.userScore) / 10.0).toString()
                val isOngoing =
                    mediaModel.status == currActivity()!!.getString(R.string.status_releasing)
                val isUserScored = mediaModel.userScore != 0
                val watchedEpisodes = (mediaModel.userProgress ?: "~").toString()
                val totalEpisode =
                    if (mediaModel.anime?.nextAiringEpisode != null) (mediaModel.anime.nextAiringEpisode.toString() + " | " + (mediaModel.anime.totalEpisodes
                        ?: "~").toString()) else (mediaModel.anime?.totalEpisodes ?: "~").toString()
                val chapters = " Chapters"
                val totalEpisodesList =
                    if (mediaModel.anime?.nextAiringEpisode != null) (mediaModel.anime.nextAiringEpisode.toString()) else (mediaModel.anime?.totalEpisodes
                        ?: "~").toString()
                return OfflineAnimeModel(
                    title,
                    score,
                    totalEpisode,
                    totalEpisodesList,
                    watchedEpisodes,
                    type,
                    chapters,
                    isOngoing,
                    isUserScored,
                    coverUri,
                    bannerUri
                )
            } catch (e: Exception) {
                Logger.log("Error loading media.json: ${e.message}")
                Logger.log(e)
                Injekt.get<CrashlyticsInterface>().logException(e)
                return OfflineAnimeModel(
                    "unknown",
                    "0",
                    "??",
                    "??",
                    "??",
                    "movie",
                    "hmm",
                    isOngoing = false,
                    isUserScored = false,
                    null,
                    null
                )
            }
        }
        @Deprecated("external storage is deprecated, use SAF instead")
        fun loadOfflineMangaModelCompat(downloadedType: DownloadedType): OfflineMangaModel {
            val type = when (downloadedType.type) {
                MediaType.MANGA -> "Manga"
                MediaType.ANIME -> "Anime"
                else -> "Novel"
            }
            val directory = File(
                currContext()?.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                "Dantotsu/$type/${downloadedType.titleName}"
            )
            //load media.json and convert to media class with gson
            try {
                val mediaModel = loadMediaCompat(downloadedType)!!
                val cover = File(directory, "cover.jpg")
                val coverUri: Uri? = if (cover.exists()) {
                    Uri.fromFile(cover)
                } else null
                val banner = File(directory, "banner.jpg")
                val bannerUri: Uri? = if (banner.exists()) {
                    Uri.fromFile(banner)
                } else null
                val title = mediaModel.mainName()
                val score = ((if (mediaModel.userScore == 0) (mediaModel.meanScore
                    ?: 0) else mediaModel.userScore) / 10.0).toString()
                val isOngoing =
                    mediaModel.status == currActivity()!!.getString(R.string.status_releasing)
                val isUserScored = mediaModel.userScore != 0
                val readchapter = (mediaModel.userProgress ?: "~").toString()
                val totalchapter = "${mediaModel.manga?.totalChapters ?: "??"}"
                val chapters = " Chapters"
                return OfflineMangaModel(
                    title,
                    score,
                    totalchapter,
                    readchapter,
                    type,
                    chapters,
                    isOngoing,
                    isUserScored,
                    coverUri,
                    bannerUri
                )
            } catch (e: Exception) {
                Logger.log("Error loading media.json: ${e.message}")
                Logger.log(e)
                Injekt.get<CrashlyticsInterface>().logException(e)
                return OfflineMangaModel(
                    "unknown",
                    "0",
                    "??",
                    "??",
                    "movie",
                    "hmm",
                    isOngoing = false,
                    isUserScored = false,
                    null,
                    null
                )
            }
        }
        @Deprecated("external storage is deprecated, use SAF instead")
        suspend fun loadEpisodesCompat(
            animeLink: String,
            extra: Map<String, String>?,
            sAnime: SAnime
        ): List<Episode> {
            val directory = File(
                currContext()?.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                "${animeLocation}/$animeLink"
            )
            //get all of the folder names and add them to the list
            val episodes = mutableListOf<Episode>()
            if (directory.exists()) {
                directory.listFiles()?.forEach {
                    //put the title and episdode number in the extra data
                    val extraData = mutableMapOf<String, String>()
                    extraData["title"] = animeLink
                    extraData["episode"] = it.name
                    if (it.isDirectory) {
                        val episode = Episode(
                            it.name,
                            "$animeLink - ${it.name}",
                            it.name,
                            null,
                            null,
                            extra = extraData,
                            sEpisode = SEpisodeImpl()
                        )
                        episodes.add(episode)
                    }
                }
                episodes.sortBy { MediaNameAdapter.findEpisodeNumber(it.number) }
                return episodes
            }
            return emptyList()
        }
        @Deprecated("external storage is deprecated, use SAF instead")
        suspend fun loadChaptersCompat(
            mangaLink: String,
            extra: Map<String, String>?,
            sManga: SManga
        ): List<MangaChapter> {
            val directory = File(
                currContext()?.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                "Dantotsu/Manga/$mangaLink"
            )
            //get all of the folder names and add them to the list
            val chapters = mutableListOf<MangaChapter>()
            if (directory.exists()) {
                directory.listFiles()?.forEach {
                    if (it.isDirectory) {
                        val chapter = MangaChapter(
                            it.name,
                            "$mangaLink/${it.name}",
                            it.name,
                            null,
                            null,
                            SChapter.create()
                        )
                        chapters.add(chapter)
                    }
                }
                chapters.sortBy { MediaNameAdapter.findChapterNumber(it.number) }
                return chapters
            }
            return emptyList()
        }
        @Deprecated("external storage is deprecated, use SAF instead")
        suspend fun loadImagesCompat(chapterLink: String, sChapter: SChapter): List<MangaImage> {
            val directory = File(
                currContext()?.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                "Dantotsu/Manga/$chapterLink"
            )
            val images = mutableListOf<MangaImage>()
            val imageNumberRegex = Regex("""(\d+)\.jpg$""")
            if (directory.exists()) {
                directory.listFiles()?.forEach {
                    if (it.isFile) {
                        val image = MangaImage(it.absolutePath, false, null)
                        images.add(image)
                    }
                }
                images.sortBy { image ->
                    val matchResult = imageNumberRegex.find(image.url.url)
                    matchResult?.groups?.get(1)?.value?.toIntOrNull() ?: Int.MAX_VALUE
                }
                for (image in images) {
                    Logger.log("imageNumber: ${image.url.url}")
                }
                return images
            }
            return emptyList()
        }
        @Deprecated("external storage is deprecated, use SAF instead")
        fun loadSubtitleCompat(title: String, episode: String): List<Subtitle>? {
            currContext()?.let {
                File(
                    it.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                    "$animeLocation/$title/$episode"
                ).listFiles()?.forEach {
                    if (it.name.contains("subtitle")) {
                        return listOf(
                            Subtitle(
                                "Downloaded Subtitle",
                                Uri.fromFile(it).toString(),
                                determineSubtitletype(it.absolutePath)
                            )
                        )
                    }
                }
            }
            return null
        }
        private fun determineSubtitletype(url: String): SubtitleType {
            return when {
                url.lowercase(Locale.ROOT).endsWith("ass") -> SubtitleType.ASS
                url.lowercase(Locale.ROOT).endsWith("vtt") -> SubtitleType.VTT
                else -> SubtitleType.SRT
            }
        }
        @Deprecated("external storage is deprecated, use SAF instead")
        fun removeMediaCompat(context: Context, title: String, type: MediaType) {
            val subDirectory = if (type == MediaType.MANGA) {
                "Manga"
            } else if (type == MediaType.ANIME) {
                "Anime"
            } else {
                "Novel"
            }
            val directory = File(
                context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                "Dantotsu/$subDirectory/$title"
            )
            if (directory.exists()) {
                directory.deleteRecursively()
            }
        }
        @Deprecated("external storage is deprecated, use SAF instead")
        fun removeDownloadCompat(context: Context, downloadedType: DownloadedType, toast: Boolean) {
            val directory = if (downloadedType.type == MediaType.MANGA) {
                File(
                    context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                    "Dantotsu/Manga/${downloadedType.titleName}/${downloadedType.chapterName}"
                )
            } else if (downloadedType.type == MediaType.ANIME) {
                File(
                    context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                    "Dantotsu/Anime/${downloadedType.titleName}/${downloadedType.chapterName}"
                )
            } else {
                File(
                    context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                    "Dantotsu/Novel/${downloadedType.titleName}/${downloadedType.chapterName}"
                )
            }
            // Check if the directory exists and delete it recursively
            if (directory.exists()) {
                val deleted = directory.deleteRecursively()
                if (toast) {
                    if (deleted) {
                        Toast.makeText(context, "Successfully deleted", Toast.LENGTH_SHORT).show()
                    } else {
                        Toast.makeText(context, "Failed to delete directory", Toast.LENGTH_SHORT)
                            .show()
                    }
                }
            }
        }
        private val animeLocation = "Dantotsu/Anime"
    }
 }
--- a/app/src/main/java/ani/dantotsu/download/DownloadsManager.kt
+++ b/app/src/main/java/ani/dantotsu/download/DownloadsManager.kt
@ -1,13 +1,27 @@
 package ani.dantotsu.download
 import android.content.Context
-import android.os.Environment
+import android.net.Uri
-import android.widget.Toast
+import androidx.documentfile.provider.DocumentFile
 import ani.dantotsu.download.DownloadCompat.Companion.removeDownloadCompat
 import ani.dantotsu.download.DownloadCompat.Companion.removeMediaCompat
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaType
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.snackString
 import ani.dantotsu.util.Logger
 import com.anggrayudi.storage.callback.FolderCallback
 import com.anggrayudi.storage.file.deleteRecursively
 import com.anggrayudi.storage.file.findFolder
 import com.anggrayudi.storage.file.moveFolderTo
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import java.io.File
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import me.xdrop.fuzzywuzzy.FuzzySearch
 import java.io.Serializable
 class DownloadsManager(private val context: Context) {
@ -15,11 +29,11 @@ class DownloadsManager(private val context: Context) {
    private val downloadsList = loadDownloads().toMutableList()
    val mangaDownloadedTypes: List<DownloadedType>
-        get() = downloadsList.filter { it.type == DownloadedType.Type.MANGA }
+        get() = downloadsList.filter { it.type == MediaType.MANGA }
    val animeDownloadedTypes: List<DownloadedType>
-        get() = downloadsList.filter { it.type == DownloadedType.Type.ANIME }
+        get() = downloadsList.filter { it.type == MediaType.ANIME }
    val novelDownloadedTypes: List<DownloadedType>
-        get() = downloadsList.filter { it.type == DownloadedType.Type.NOVEL }
+        get() = downloadsList.filter { it.type == MediaType.NOVEL }
    private fun saveDownloads() {
        val jsonString = gson.toJson(downloadsList)
@ -41,84 +55,72 @@ class DownloadsManager(private val context: Context) {
        saveDownloads()
    }
-    fun removeDownload(downloadedType: DownloadedType) {
+    fun removeDownload(
        downloadedType: DownloadedType,
        toast: Boolean = true,
        onFinished: () -> Unit
    ) {
        removeDownloadCompat(context, downloadedType, toast)
        downloadsList.remove(downloadedType)
-        removeDirectory(downloadedType)
+        CoroutineScope(Dispatchers.IO).launch {
            removeDirectory(downloadedType, toast)
            withContext(Dispatchers.Main) {
                onFinished()
            }
        }
        saveDownloads()
    }
-    fun removeMedia(title: String, type: DownloadedType.Type) {
+    fun removeMedia(title: String, type: MediaType) {
-        val subDirectory = if (type == DownloadedType.Type.MANGA) {
+        removeMediaCompat(context, title, type)
-            "Manga"
+        val baseDirectory = getBaseDirectory(context, type)
-        } else if (type == DownloadedType.Type.ANIME) {
+        val directory = baseDirectory?.findFolder(title)
-            "Anime"
+        if (directory?.exists() == true) {
-        } else {
+            val deleted = directory.deleteRecursively(context, false)
            "Novel"
        }
        val directory = File(
            context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
            "Dantotsu/$subDirectory/$title"
        )
        if (directory.exists()) {
            val deleted = directory.deleteRecursively()
            if (deleted) {
-                Toast.makeText(context, "Successfully deleted", Toast.LENGTH_SHORT).show()
+                snackString("Successfully deleted")
            } else {
-                Toast.makeText(context, "Failed to delete directory", Toast.LENGTH_SHORT).show()
+                snackString("Failed to delete directory")
            }
        } else {
-            Toast.makeText(context, "Directory does not exist", Toast.LENGTH_SHORT).show()
+            snackString("Directory does not exist")
            cleanDownloads()
        }
        when (type) {
-            DownloadedType.Type.MANGA -> {
+            MediaType.MANGA -> {
-                downloadsList.removeAll { it.title == title && it.type == DownloadedType.Type.MANGA }
+                downloadsList.removeAll { it.titleName == title && it.type == MediaType.MANGA }
            }
-            DownloadedType.Type.ANIME -> {
+            MediaType.ANIME -> {
-                downloadsList.removeAll { it.title == title && it.type == DownloadedType.Type.ANIME }
+                downloadsList.removeAll { it.titleName == title && it.type == MediaType.ANIME }
            }
-            DownloadedType.Type.NOVEL -> {
+            MediaType.NOVEL -> {
-                downloadsList.removeAll { it.title == title && it.type == DownloadedType.Type.NOVEL }
+                downloadsList.removeAll { it.titleName == title && it.type == MediaType.NOVEL }
            }
        }
        saveDownloads()
    }
    private fun cleanDownloads() {
-        cleanDownload(DownloadedType.Type.MANGA)
+        cleanDownload(MediaType.MANGA)
-        cleanDownload(DownloadedType.Type.ANIME)
+        cleanDownload(MediaType.ANIME)
-        cleanDownload(DownloadedType.Type.NOVEL)
+        cleanDownload(MediaType.NOVEL)
    }
-    private fun cleanDownload(type: DownloadedType.Type) {
+    private fun cleanDownload(type: MediaType) {
        // remove all folders that are not in the downloads list
-        val subDirectory = if (type == DownloadedType.Type.MANGA) {
+        val directory = getBaseDirectory(context, type)
-            "Manga"
+        val downloadsSubLists = when (type) {
-        } else if (type == DownloadedType.Type.ANIME) {
+            MediaType.MANGA -> mangaDownloadedTypes
-            "Anime"
+            MediaType.ANIME -> animeDownloadedTypes
-        } else {
+            else -> novelDownloadedTypes
            "Novel"
        }
-        val directory = File(
+        if (directory?.exists() == true && directory.isDirectory) {
            context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
            "Dantotsu/$subDirectory"
        )
        val downloadsSubLists = if (type == DownloadedType.Type.MANGA) {
            mangaDownloadedTypes
        } else if (type == DownloadedType.Type.ANIME) {
            animeDownloadedTypes
        } else {
            novelDownloadedTypes
        }
        if (directory.exists()) {
            val files = directory.listFiles()
            if (files != null) {
            for (file in files) {
-                    if (!downloadsSubLists.any { it.title == file.name }) {
+                if (!downloadsSubLists.any { it.titleName == file.name }) {
-                        val deleted = file.deleteRecursively()
+                    file.deleteRecursively(context, false)
                    }
                }
            }
        }
@ -126,122 +128,138 @@ class DownloadsManager(private val context: Context) {
        val iterator = downloadsList.iterator()
        while (iterator.hasNext()) {
            val download = iterator.next()
-            val downloadDir = File(directory, download.title)
+            val downloadDir = directory?.findFolder(download.titleName)
-            if ((!downloadDir.exists() && download.type == type) || download.title.isBlank()) {
+            if ((downloadDir?.exists() == false && download.type == type) || download.titleName.isBlank()) {
                iterator.remove()
            }
        }
    }
-    fun saveDownloadsListToJSONFileInDownloadsFolder(downloadsList: List<DownloadedType>)  //for debugging
+    fun moveDownloadsDir(
-    {
+        context: Context,
-        val jsonString = gson.toJson(downloadsList)
+        oldUri: Uri,
-        val file = File(
+        newUri: Uri,
-            context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
+        finished: (Boolean, String) -> Unit
-            "Dantotsu/downloads.json"
+    ) {
        if (oldUri == newUri) {
            Logger.log("Source and destination are the same")
            finished(false, "Source and destination are the same")
            return
        }
        if (oldUri == Uri.EMPTY) {
            Logger.log("Old Uri is empty")
            finished(true, "Old Uri is empty")
            return
        }
        CoroutineScope(Dispatchers.IO).launch {
            try {
                val oldBase =
                    DocumentFile.fromTreeUri(context, oldUri) ?: throw Exception("Old base is null")
                val newBase =
                    DocumentFile.fromTreeUri(context, newUri) ?: throw Exception("New base is null")
                val folder =
                    oldBase.findFolder(BASE_LOCATION) ?: throw Exception("Base folder not found")
                folder.moveFolderTo(context, newBase, false, BASE_LOCATION, object :
                    FolderCallback() {
                    override fun onFailed(errorCode: ErrorCode) {
                        when (errorCode) {
                            ErrorCode.CANCELED -> finished(false, "Move canceled")
                            ErrorCode.CANNOT_CREATE_FILE_IN_TARGET -> finished(
                                false,
                                "Cannot create file in target"
                            )
-        if (file.parentFile?.exists() == false) {
+
-            file.parentFile?.mkdirs()
+                            ErrorCode.INVALID_TARGET_FOLDER -> finished(
                                true,
                                "Invalid target folder"
                            ) // seems to still work
                            ErrorCode.NO_SPACE_LEFT_ON_TARGET_PATH -> finished(
                                false,
                                "No space left on target path"
                            )
                            ErrorCode.UNKNOWN_IO_ERROR -> finished(false, "Unknown IO error")
                            ErrorCode.SOURCE_FOLDER_NOT_FOUND -> finished(
                                false,
                                "Source folder not found"
                            )
                            ErrorCode.STORAGE_PERMISSION_DENIED -> finished(
                                false,
                                "Storage permission denied"
                            )
                            ErrorCode.TARGET_FOLDER_CANNOT_HAVE_SAME_PATH_WITH_SOURCE_FOLDER -> finished(
                                false,
                                "Target folder cannot have same path with source folder"
                            )
                            else -> finished(false, "Failed to move downloads: $errorCode")
                        }
                        Logger.log("Failed to move downloads: $errorCode")
                        super.onFailed(errorCode)
                    }
                    override fun onCompleted(result: Result) {
                        finished(true, "Successfully moved downloads")
                        super.onCompleted(result)
                    }
                })
            } catch (e: Exception) {
                snackString("Error: ${e.message}")
                Logger.log("Failed to move downloads: ${e.message}")
                Logger.log(e)
                Logger.log("oldUri: $oldUri, newUri: $newUri")
                finished(false, "Failed to move downloads: ${e.message}")
                return@launch
            }
        if (!file.exists()) {
            file.createNewFile()
        }
        file.writeText(jsonString)
    }
    fun queryDownload(downloadedType: DownloadedType): Boolean {
        return downloadsList.contains(downloadedType)
    }
-    fun queryDownload(title: String, chapter: String, type: DownloadedType.Type? = null): Boolean {
+    fun queryDownload(title: String, chapter: String, type: MediaType? = null): Boolean {
        return if (type == null) {
-            downloadsList.any { it.title == title && it.chapter == chapter }
+            downloadsList.any { it.titleName == title && it.chapterName == chapter }
        } else {
-            downloadsList.any { it.title == title && it.chapter == chapter && it.type == type }
+            downloadsList.any { it.titleName == title && it.chapterName == chapter && it.type == type }
        }
    }
-    private fun removeDirectory(downloadedType: DownloadedType) {
+    private fun removeDirectory(downloadedType: DownloadedType, toast: Boolean) {
-        val directory = if (downloadedType.type == DownloadedType.Type.MANGA) {
+        val baseDirectory = getBaseDirectory(context, downloadedType.type)
-            File(
+        val directory =
-                context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
+            baseDirectory?.findFolder(downloadedType.titleName)
-                "Dantotsu/Manga/${downloadedType.title}/${downloadedType.chapter}"
+                ?.findFolder(downloadedType.chapterName)
-            )
+        downloadsList.remove(downloadedType)
        } else if (downloadedType.type == DownloadedType.Type.ANIME) {
            File(
                context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                "Dantotsu/Anime/${downloadedType.title}/${downloadedType.chapter}"
            )
        } else {
            File(
                context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                "Dantotsu/Novel/${downloadedType.title}/${downloadedType.chapter}"
            )
        }
        // Check if the directory exists and delete it recursively
-        if (directory.exists()) {
+        if (directory?.exists() == true) {
-            val deleted = directory.deleteRecursively()
+            val deleted = directory.deleteRecursively(context, false)
            if (deleted) {
-                Toast.makeText(context, "Successfully deleted", Toast.LENGTH_SHORT).show()
+                if (toast) snackString("Successfully deleted")
            } else {
-                Toast.makeText(context, "Failed to delete directory", Toast.LENGTH_SHORT).show()
+                snackString("Failed to delete directory")
            }
        } else {
-            Toast.makeText(context, "Directory does not exist", Toast.LENGTH_SHORT).show()
+            snackString("Directory does not exist")
        }
    }
-    fun exportDownloads(downloadedType: DownloadedType) { //copies to the downloads folder available to the user
+    fun purgeDownloads(type: MediaType) {
-        val directory = if (downloadedType.type == DownloadedType.Type.MANGA) {
+        val directory = getBaseDirectory(context, type)
-            File(
+        if (directory?.exists() == true) {
-                context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
+            val deleted = directory.deleteRecursively(context, false)
                "Dantotsu/Manga/${downloadedType.title}/${downloadedType.chapter}"
            )
        } else if (downloadedType.type == DownloadedType.Type.ANIME) {
            File(
                context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                "Dantotsu/Anime/${downloadedType.title}/${downloadedType.chapter}"
            )
        } else {
            File(
                context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                "Dantotsu/Novel/${downloadedType.title}/${downloadedType.chapter}"
            )
        }
        val destination = File(
            context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
            "Dantotsu/${downloadedType.title}/${downloadedType.chapter}"
        )
        if (directory.exists()) {
            val copied = directory.copyRecursively(destination, true)
            if (copied) {
                Toast.makeText(context, "Successfully copied", Toast.LENGTH_SHORT).show()
            } else {
                Toast.makeText(context, "Failed to copy directory", Toast.LENGTH_SHORT).show()
            }
        } else {
            Toast.makeText(context, "Directory does not exist", Toast.LENGTH_SHORT).show()
        }
    }
    fun purgeDownloads(type: DownloadedType.Type) {
        val directory = if (type == DownloadedType.Type.MANGA) {
            File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "Dantotsu/Manga")
        } else if (type == DownloadedType.Type.ANIME) {
            File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "Dantotsu/Anime")
        } else {
            File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "Dantotsu/Novel")
        }
        if (directory.exists()) {
            val deleted = directory.deleteRecursively()
            if (deleted) {
-                Toast.makeText(context, "Successfully deleted", Toast.LENGTH_SHORT).show()
+                snackString("Successfully deleted")
            } else {
-                Toast.makeText(context, "Failed to delete directory", Toast.LENGTH_SHORT).show()
+                snackString("Failed to delete directory")
            }
        } else {
-            Toast.makeText(context, "Directory does not exist", Toast.LENGTH_SHORT).show()
+            snackString("Directory does not exist")
        }
        downloadsList.removeAll { it.type == type }
@ -249,62 +267,132 @@ class DownloadsManager(private val context: Context) {
    }
    companion object {
-        const val novelLocation = "Dantotsu/Novel"
+        private const val BASE_LOCATION = "Dantotsu"
-        const val mangaLocation = "Dantotsu/Manga"
+        private const val MANGA_SUB_LOCATION = "Manga"
-        const val animeLocation = "Dantotsu/Anime"
+        private const val ANIME_SUB_LOCATION = "Anime"
        private const val NOVEL_SUB_LOCATION = "Novel"
-        fun getDirectory(
+
        /**
         * Get and create a base directory for the given type
         * @param context the context
         * @param type the type of media
         * @return the base directory
         */
        private fun getBaseDirectory(context: Context, type: MediaType): DocumentFile? {
            val baseDirectory = Uri.parse(PrefManager.getVal<String>(PrefName.DownloadsDir))
            if (baseDirectory == Uri.EMPTY) return null
            var base = DocumentFile.fromTreeUri(context, baseDirectory) ?: return null
            base = base.findOrCreateFolder(BASE_LOCATION, false) ?: return null
            return when (type) {
                MediaType.MANGA -> {
                    base.findOrCreateFolder(MANGA_SUB_LOCATION, false)
                }
                MediaType.ANIME -> {
                    base.findOrCreateFolder(ANIME_SUB_LOCATION, false)
                }
                else -> {
                    base.findOrCreateFolder(NOVEL_SUB_LOCATION, false)
                }
            }
        }
        /**
         * Get and create a subdirectory for the given type
         * @param context the context
         * @param type the type of media
         * @param title the title of the media
         * @param chapter the chapter of the media
         * @return the subdirectory
         */
        fun getSubDirectory(
            context: Context,
-            type: DownloadedType.Type,
+            type: MediaType,
            overwrite: Boolean,
            title: String,
            chapter: String? = null
-        ): File {
+        ): DocumentFile? {
-            return if (type == DownloadedType.Type.MANGA) {
+            val baseDirectory = getBaseDirectory(context, type) ?: return null
-                if (chapter != null) {
+            return if (chapter != null) {
-                    File(
+                baseDirectory.findOrCreateFolder(title, false)
-                        context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
+                    ?.findOrCreateFolder(chapter, overwrite)
                        "$mangaLocation/$title/$chapter"
                    )
            } else {
-                    File(
+                baseDirectory.findOrCreateFolder(title, overwrite)
                        context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                        "$mangaLocation/$title"
                    )
                }
            } else if (type == DownloadedType.Type.ANIME) {
                if (chapter != null) {
                    File(
                        context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                        "$animeLocation/$title/$chapter"
                    )
                } else {
                    File(
                        context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                        "$animeLocation/$title"
                    )
                }
            } else {
                if (chapter != null) {
                    File(
                        context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                        "$novelLocation/$title/$chapter"
                    )
                } else {
                    File(
                        context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
                        "$novelLocation/$title"
                    )
                }
            }
            }
        }
-}
+        fun getDirSize(
            context: Context,
            type: MediaType,
            title: String,
            chapter: String? = null
        ): Long {
            val directory = getSubDirectory(context, type, false, title, chapter) ?: return 0
            var size = 0L
            directory.listFiles().forEach {
                size += it.length()
            }
            return size
        }
-data class DownloadedType(val title: String, val chapter: String, val type: Type) : Serializable {
+        fun addNoMedia(context: Context) {
-    enum class Type {
+            val baseDirectory = getBaseDirectory(context) ?: return
-        MANGA,
+            if (baseDirectory.findFile(".nomedia") == null) {
-        ANIME,
+                baseDirectory.createFile("application/octet-stream", ".nomedia")
-        NOVEL
+            }
        }
        private fun getBaseDirectory(context: Context): DocumentFile? {
            val baseDirectory = Uri.parse(PrefManager.getVal<String>(PrefName.DownloadsDir))
            if (baseDirectory == Uri.EMPTY) return null
            return DocumentFile.fromTreeUri(context, baseDirectory)
        }
        private fun DocumentFile.findOrCreateFolder(
            name: String, overwrite: Boolean
        ): DocumentFile? {
            return if (overwrite) {
                findFolder(name.findValidName())?.delete()
                createDirectory(name.findValidName())
            } else {
                findFolder(name.findValidName()) ?: createDirectory(name.findValidName())
            }
        }
        private const val RATIO_THRESHOLD = 95
        fun Media.compareName(name: String): Boolean {
            val mainName = mainName().findValidName().lowercase()
            val ratio = FuzzySearch.ratio(mainName, name.lowercase())
            return ratio > RATIO_THRESHOLD
        }
        fun String.compareName(name: String): Boolean {
            val mainName = findValidName().lowercase()
            val compareName = name.findValidName().lowercase()
            val ratio = FuzzySearch.ratio(mainName, compareName)
            return ratio > RATIO_THRESHOLD
        }
    }
 }
 private const val RESERVED_CHARS = "|\\?*<\":>+[]/'"
 fun String?.findValidName(): String {
    return this?.replace("/","_")?.filterNot { RESERVED_CHARS.contains(it) } ?: ""
 }
 data class DownloadedType(
    private val pTitle: String?,
    private val pChapter: String?,
    val type: MediaType,
    @Deprecated("use pTitle instead")
    private val title: String? = null,
    @Deprecated("use pChapter instead")
    private val chapter: String? = null
 ) : Serializable {
    val titleName: String
        get() = title ?: pTitle.findValidName()
    val chapterName: String
        get() = chapter ?: pChapter.findValidName()
 }
--- a/app/src/main/java/ani/dantotsu/download/anime/AnimeDownloaderService.kt
+++ b/app/src/main/java/ani/dantotsu/download/anime/AnimeDownloaderService.kt
@ -9,32 +9,34 @@ import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.content.pm.ServiceInfo
 import android.os.Build
 import android.os.Environment
 import android.os.IBinder
 import android.widget.Toast
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import androidx.documentfile.provider.DocumentFile
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.offline.DownloadManager
 import androidx.media3.exoplayer.offline.DownloadService
 import ani.dantotsu.FileUrl
 import ani.dantotsu.R
 import ani.dantotsu.addons.download.DownloadAddonManager
 import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
-import ani.dantotsu.currActivity
+import ani.dantotsu.defaultHeaders
 import ani.dantotsu.download.DownloadedType
 import ani.dantotsu.download.DownloadsManager
-import ani.dantotsu.download.video.ExoplayerDownloadService
+import ani.dantotsu.download.DownloadsManager.Companion.getSubDirectory
-import ani.dantotsu.download.video.Helper
+import ani.dantotsu.download.anime.AnimeDownloaderService.AnimeDownloadTask.Companion.getTaskName
-import ani.dantotsu.util.Logger
+import ani.dantotsu.download.findValidName
 import ani.dantotsu.media.Media
-import ani.dantotsu.media.SubtitleDownloader
+import ani.dantotsu.media.MediaType
 import ani.dantotsu.media.anime.AnimeWatchFragment
 import ani.dantotsu.parsers.Subtitle
 import ani.dantotsu.parsers.Video
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.snackString
 import ani.dantotsu.toast
 import ani.dantotsu.util.Logger
 import com.anggrayudi.storage.file.forceDelete
 import com.anggrayudi.storage.file.openOutputStream
 import com.google.gson.GsonBuilder
 import com.google.gson.InstanceCreator
 import eu.kanade.tachiyomi.animesource.model.SAnime
@ -45,25 +47,21 @@ import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SChapterImpl
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import tachiyomi.core.util.lang.launchIO
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.File
 import java.io.FileOutputStream
 import java.net.HttpURLConnection
 import java.net.URL
 import java.util.Queue
 import java.util.concurrent.ConcurrentLinkedQueue
 class AnimeDownloaderService : Service() {
    private lateinit var notificationManager: NotificationManagerCompat
@ -74,6 +72,7 @@ class AnimeDownloaderService : Service() {
    private val mutex = Mutex()
    private var isCurrentlyProcessing = false
    private var currentTasks: MutableList<AnimeDownloadTask> = mutableListOf()
    private val ffExtension = Injekt.get<DownloadAddonManager>().extension?.extension
    override fun onBind(intent: Intent?): IBinder? {
        // This is only required for bound services.
@ -82,6 +81,11 @@ class AnimeDownloaderService : Service() {
    override fun onCreate() {
        super.onCreate()
        if (ffExtension == null) {
            toast(getString(R.string.download_addon_not_found))
            stopSelf()
            return
        }
        notificationManager = NotificationManagerCompat.from(this)
        builder =
            NotificationCompat.Builder(this, Notifications.CHANNEL_DOWNLOADER_PROGRESS).apply {
@ -89,6 +93,7 @@ class AnimeDownloaderService : Service() {
                setSmallIcon(R.drawable.ic_download_24)
                priority = NotificationCompat.PRIORITY_DEFAULT
                setOnlyAlertOnce(true)
                setProgress(100, 0, false)
            }
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
            startForeground(
@ -157,27 +162,14 @@ class AnimeDownloaderService : Service() {
    @UnstableApi
    fun cancelDownload(taskName: String) {
-        val url =
+        val sessionIds =
-            AnimeServiceDataSingleton.downloadQueue.find { it.getTaskName() == taskName }?.video?.file?.url
+            AnimeServiceDataSingleton.downloadQueue.filter { it.getTaskName() == taskName }
-                ?: currentTasks.find { it.getTaskName() == taskName }?.video?.file?.url ?: ""
+                .map { it.sessionId }.toMutableList()
-        if (url.isEmpty()) {
+        sessionIds.addAll(currentTasks.filter { it.getTaskName() == taskName }.map { it.sessionId })
-            snackString("Failed to cancel download")
+        sessionIds.forEach {
-            return
+            ffExtension!!.cancelDownload(it)
        }
        currentTasks.removeAll { it.getTaskName() == taskName }
        DownloadService.sendSetStopReason(
            this@AnimeDownloaderService,
            ExoplayerDownloadService::class.java,
            url,
            androidx.media3.exoplayer.offline.Download.STATE_STOPPED,
            false
        )
        DownloadService.sendRemoveDownload(
            this@AnimeDownloaderService,
            ExoplayerDownloadService::class.java,
            url,
            false
        )
        CoroutineScope(Dispatchers.Default).launch {
            mutex.withLock {
                downloadJobs[taskName]?.cancel()
@ -210,7 +202,6 @@ class AnimeDownloaderService : Service() {
    @androidx.annotation.OptIn(UnstableApi::class)
    suspend fun download(task: AnimeDownloadTask) {
        try {
            val downloadManager = Helper.downloadManager(this@AnimeDownloaderService)
            withContext(Dispatchers.Main) {
                val notifi = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                    ContextCompat.checkSelfPermission(
@ -221,65 +212,96 @@ class AnimeDownloaderService : Service() {
                    true
                }
-                builder.setContentText("Downloading ${task.title} - ${task.episode}")
+                builder.setContentText("Downloading ${getTaskName(task.title, task.episode)}")
                if (notifi) {
                    notificationManager.notify(NOTIFICATION_ID, builder.build())
                }
-                currActivity()?.let {
+                val outputDir = getSubDirectory(
-                    Helper.downloadVideo(
+                    this@AnimeDownloaderService,
-                        it,
+                    MediaType.ANIME,
-                        task.video,
+                    false,
-                        task.subtitle
+                    task.title,
                    task.episode
                ) ?: throw Exception("Failed to create output directory")
                val extension = ffExtension!!.getFileExtension()
                outputDir.findFile("${task.getTaskName().findValidName()}.${extension.first}")?.delete()
                val outputFile =
                    outputDir.createFile(extension.second, "${task.getTaskName()}.${extension.first}")
                        ?: throw Exception("Failed to create output file")
                var percent = 0
                var totalLength = 0.0
                val path = ffExtension.setDownloadPath(
                    this@AnimeDownloaderService,
                    outputFile.uri
                )
                if (!task.video.file.headers.containsKey("User-Agent")
                    && !task.video.file.headers.containsKey("user-agent")
                ) {
                    val newHeaders = task.video.file.headers.toMutableMap()
                    newHeaders["User-Agent"] = defaultHeaders["User-Agent"]!!
                    task.video.file.headers = newHeaders
                }
                ffExtension.executeFFProbe(
                    task.video.file.url,
                    task.video.file.headers
                ) {
                    if (it.toDoubleOrNull() != null) {
                        totalLength = it.toDouble()
                    }
                }
                val ffTask =
                    ffExtension.executeFFMpeg(
                        task.video.file.url,
                        path,
                        task.video.file.headers,
                        task.subtitle,
                        task.audio,
                    ) {
                        // CALLED WHEN SESSION GENERATES STATISTICS
                        val timeInMilliseconds = it
                        if (timeInMilliseconds > 0 && totalLength > 0) {
                            percent = ((it / 1000) / totalLength * 100).toInt()
                        }
                        Logger.log("Statistics: $it")
                    }
                task.sessionId = ffTask
                currentTasks.find { it.getTaskName() == task.getTaskName() }?.sessionId =
                    ffTask
                saveMediaInfo(task)
                task.subtitle?.let {
                    SubtitleDownloader.downloadSubtitle(
                        this@AnimeDownloaderService,
                        it.file.url,
                        DownloadedType(
                            task.title,
                            task.episode,
                            DownloadedType.Type.ANIME,
                        )
                    )
                }
                val downloadStarted =
                    hasDownloadStarted(downloadManager, task, 30000) // 30 seconds timeout
                if (!downloadStarted) {
                    Logger.log("Download failed to start")
                    builder.setContentText("${task.title} - ${task.episode} Download failed to start")
                    notificationManager.notify(NOTIFICATION_ID, builder.build())
                    snackString("${task.title} - ${task.episode} Download failed to start")
                    broadcastDownloadFailed(task.episode)
                    return@withContext
                }
                // periodically check if the download is complete
-                while (downloadManager.downloadIndex.getDownload(task.video.file.url) != null) {
+                while (ffExtension.getState(ffTask) != "COMPLETED") {
-                    val download = downloadManager.downloadIndex.getDownload(task.video.file.url)
+                    if (ffExtension.getState(ffTask) == "FAILED") {
                    if (download != null) {
                        if (download.state == androidx.media3.exoplayer.offline.Download.STATE_FAILED) {
                        Logger.log("Download failed")
-                            builder.setContentText("${task.title} - ${task.episode} Download failed")
+                        builder.setContentText(
                            "${
                                getTaskName(
                                    task.title,
                                    task.episode
                                )
                            } Download failed"
                        )
                        notificationManager.notify(NOTIFICATION_ID, builder.build())
-                            snackString("${task.title} - ${task.episode} Download failed")
+                        toast("${getTaskName(task.title, task.episode)} Download failed")
-                            Logger.log("Download failed: ${download.failureReason}")
+                        Logger.log("Download failed: ${ffExtension.getStackTrace(ffTask)}")
                        downloadsManager.removeDownload(
                            DownloadedType(
                                task.title,
                                task.episode,
-                                    DownloadedType.Type.ANIME,
+                                MediaType.ANIME,
-                                )
+                            ),
-                            )
+                            false
                        ) {}
                        Injekt.get<CrashlyticsInterface>().logException(
                            Exception(
                                "Anime Download failed:" +
-                                            " ${download.failureReason}" +
+                                        " ${getTaskName(task.title, task.episode)}" +
                                        " url: ${task.video.file.url}" +
                                        " title: ${task.title}" +
                                        " episode: ${task.episode}"
@ -289,11 +311,64 @@ class AnimeDownloaderService : Service() {
                        broadcastDownloadFailed(task.episode)
                        break
                    }
-                        if (download.state == androidx.media3.exoplayer.offline.Download.STATE_COMPLETED) {
+                    builder.setProgress(
-                            Logger.log("Download completed")
+                        100, percent.coerceAtMost(99),
-                            builder.setContentText("${task.title} - ${task.episode} Download completed")
+                        false
                    )
                    broadcastDownloadProgress(
                        task.episode,
                        percent.coerceAtMost(99)
                    )
                    if (notifi) {
                        notificationManager.notify(NOTIFICATION_ID, builder.build())
-                            snackString("${task.title} - ${task.episode} Download completed")
+                    }
                    kotlinx.coroutines.delay(2000)
                }
                if (ffExtension.getState(ffTask) == "COMPLETED") {
                    if (ffExtension.hadError(ffTask)) {
                        Logger.log("Download failed")
                        builder.setContentText(
                            "${
                                getTaskName(
                                    task.title,
                                    task.episode
                                )
                            } Download failed"
                        )
                        notificationManager.notify(NOTIFICATION_ID, builder.build())
                        snackString("${getTaskName(task.title, task.episode)} Download failed")
                        downloadsManager.removeDownload(
                            DownloadedType(
                                task.title,
                                task.episode,
                                MediaType.ANIME
                            ),
                            false
                        ) {}
                        Injekt.get<CrashlyticsInterface>().logException(
                            Exception(
                                "Anime Download failed:" +
                                        " ${getTaskName(task.title, task.episode)}" +
                                        " url: ${task.video.file.url}" +
                                        " title: ${task.title}" +
                                        " episode: ${task.episode}"
                            )
                        )
                        currentTasks.removeAll { it.getTaskName() == task.getTaskName() }
                        broadcastDownloadFailed(task.episode)
                        return@withContext
                    }
                    Logger.log("Download completed")
                    builder.setContentText(
                        "${
                            getTaskName(
                                task.title,
                                task.episode
                            )
                        } Download completed"
                    )
                    notificationManager.notify(NOTIFICATION_ID, builder.build())
                    snackString("${getTaskName(task.title, task.episode)} Download completed")
                    PrefManager.getAnimeDownloadPreferences().edit().putString(
                        task.getTaskName(),
                        task.video.file.url
@ -302,30 +377,14 @@ class AnimeDownloaderService : Service() {
                        DownloadedType(
                            task.title,
                            task.episode,
-                                    DownloadedType.Type.ANIME,
+                            MediaType.ANIME,
                        )
                    )
                    currentTasks.removeAll { it.getTaskName() == task.getTaskName() }
                    broadcastDownloadFinished(task.episode)
-                            break
+                } else throw Exception("Download failed")
-                        }
+
                        if (download.state == androidx.media3.exoplayer.offline.Download.STATE_STOPPED) {
                            Logger.log("Download stopped")
                            builder.setContentText("${task.title} - ${task.episode} Download stopped")
                            notificationManager.notify(NOTIFICATION_ID, builder.build())
                            snackString("${task.title} - ${task.episode} Download stopped")
                            break
                        }
                        broadcastDownloadProgress(
                            task.episode,
                            download.percentDownloaded.toInt()
                        )
                        if (notifi) {
                            notificationManager.notify(NOTIFICATION_ID, builder.build())
                        }
                    }
                    kotlinx.coroutines.delay(2000)
                }
            }
        } catch (e: Exception) {
            if (e.message?.contains("Coroutine was cancelled") == false) {  //wut
@ -338,34 +397,24 @@ class AnimeDownloaderService : Service() {
        }
    }
    @androidx.annotation.OptIn(UnstableApi::class)
    suspend fun hasDownloadStarted(
        downloadManager: DownloadManager,
        task: AnimeDownloadTask,
        timeout: Long
    ): Boolean {
        val startTime = System.currentTimeMillis()
        while (System.currentTimeMillis() - startTime < timeout) {
            val download = downloadManager.downloadIndex.getDownload(task.video.file.url)
            if (download != null) {
                return true
            }
            // Delay between each poll
            kotlinx.coroutines.delay(500)
        }
        return false
    }
    private fun saveMediaInfo(task: AnimeDownloadTask) {
-        launchIO {
+        CoroutineScope(Dispatchers.IO).launch {
-            val directory = File(
+            val directory =
-                getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
+                getSubDirectory(this@AnimeDownloaderService, MediaType.ANIME, false, task.title)
-                "${DownloadsManager.animeLocation}/${task.title}"
+                    ?: throw Exception("Directory not found")
            directory.findFile("media.json")?.forceDelete(this@AnimeDownloaderService)
            val file = directory.createFile("application/json", "media.json")
                ?: throw Exception("File not created")
            val episodeDirectory =
                getSubDirectory(
                    this@AnimeDownloaderService,
                    MediaType.ANIME,
                    false,
                    task.title,
                    task.episode
                )
-            val episodeDirectory = File(directory, task.episode)
+                    ?: throw Exception("Directory not found")
            if (!episodeDirectory.exists()) episodeDirectory.mkdirs()
            val file = File(directory, "media.json")
            val gson = GsonBuilder()
                .registerTypeAdapter(SChapter::class.java, InstanceCreator<SChapter> {
                    SChapterImpl() // Provide an instance of SChapterImpl
@ -399,14 +448,25 @@ class AnimeDownloaderService : Service() {
                val jsonString = gson.toJson(media)
                withContext(Dispatchers.Main) {
-                    file.writeText(jsonString)
+                    try {
                        file.openOutputStream(this@AnimeDownloaderService, false).use { output ->
                            if (output == null) throw Exception("Output stream is null")
                            output.write(jsonString.toByteArray())
                        }
                    } catch (e: android.system.ErrnoException) {
                        e.printStackTrace()
                        Toast.makeText(
                            this@AnimeDownloaderService,
                            "Error while saving: ${e.localizedMessage}",
                            Toast.LENGTH_LONG
                        ).show()
                    }
                }
            }
        }
    }
-
+    private suspend fun downloadImage(url: String, directory: DocumentFile, name: String): String? =
    private suspend fun downloadImage(url: String, directory: File, name: String): String? =
        withContext(Dispatchers.IO) {
            var connection: HttpURLConnection? = null
            println("Downloading url $url")
@ -417,13 +477,16 @@ class AnimeDownloaderService : Service() {
                    throw Exception("Server returned HTTP ${connection.responseCode} ${connection.responseMessage}")
                }
-                val file = File(directory, name)
+                directory.findFile(name)?.forceDelete(this@AnimeDownloaderService)
-                FileOutputStream(file).use { output ->
+                val file =
                    directory.createFile("image/jpeg", name) ?: throw Exception("File not created")
                file.openOutputStream(this@AnimeDownloaderService, false).use { output ->
                    if (output == null) throw Exception("Output stream is null")
                    connection.inputStream.use { input ->
                        input.copyTo(output)
                    }
                }
-                return@withContext file.absolutePath
+                return@withContext file.uri.toString()
            } catch (e: Exception) {
                e.printStackTrace()
                withContext(Dispatchers.Main) {
@ -485,19 +548,21 @@ class AnimeDownloaderService : Service() {
        val title: String,
        val episode: String,
        val video: Video,
-        val subtitle: Subtitle? = null,
+        val subtitle: List<Pair<String, String>> = emptyList(),
        val audio: List<Pair<String, String>> = emptyList(),
        val sourceMedia: Media? = null,
        val episodeImage: String? = null,
        val retries: Int = 2,
        val simultaneousDownloads: Int = 2,
        var sessionId: Long = -1
    ) {
        fun getTaskName(): String {
-            return "$title - $episode"
+            return "${title.replace("/", "")}/${episode.replace("/", "")}"
        }
        companion object {
            fun getTaskName(title: String, episode: String): String {
-                return "$title - $episode"
+                return "${title.replace("/", "")}/${episode.replace("/", "")}"
            }
        }
    }
@ -511,7 +576,6 @@ class AnimeDownloaderService : Service() {
 object AnimeServiceDataSingleton {
    var video: Video? = null
    var sourceMedia: Media? = null
    var downloadQueue: Queue<AnimeDownloaderService.AnimeDownloadTask> = ConcurrentLinkedQueue()
    @Volatile
--- a/app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeAdapter.kt
@ -1,7 +1,6 @@
 package ani.dantotsu.download.anime
 import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
@ -38,7 +37,6 @@ class OfflineAnimeAdapter(
        return position.toLong()
    }
    @SuppressLint("SetTextI18n")
    override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
        val view: View = convertView ?: when (style) {
@ -51,28 +49,28 @@ class OfflineAnimeAdapter(
        val imageView = view.findViewById<ImageView>(R.id.itemCompactImage)
        val titleTextView = view.findViewById<TextView>(R.id.itemCompactTitle)
        val itemScore = view.findViewById<TextView>(R.id.itemCompactScore)
        val itemScoreBG = view.findViewById<View>(R.id.itemCompactScoreBG)
        val ongoing = view.findViewById<CardView>(R.id.itemCompactOngoing)
-        val totalepisodes = view.findViewById<TextView>(R.id.itemCompactTotal)
+        val totalEpisodes = view.findViewById<TextView>(R.id.itemCompactTotal)
-        val typeimage = view.findViewById<ImageView>(R.id.itemCompactTypeImage)
+        val typeImage = view.findViewById<ImageView>(R.id.itemCompactTypeImage)
        val type = view.findViewById<TextView>(R.id.itemCompactRelation)
        val typeView = view.findViewById<LinearLayout>(R.id.itemCompactType)
        if (style == 0) {
            val bannerView = view.findViewById<ImageView>(R.id.itemCompactBanner) // for large view
            val episodes = view.findViewById<TextView>(R.id.itemTotal)
-            episodes.text = " Episodes"
+            val text = " ${context.getString(R.string.episodes)}"
-            bannerView.setImageURI(item.banner)
+            episodes.text = text
-            totalepisodes.text = item.totalEpisodeList
+            bannerView.setImageURI(item.banner ?: item.image)
            totalEpisodes.text = item.totalEpisodeList
        } else if (style == 1) {
            val watchedEpisodes =
                view.findViewById<TextView>(R.id.itemCompactUserProgress) // for compact view
            watchedEpisodes.text = item.watchedEpisode
-            totalepisodes.text = " | " + item.totalEpisode
+            totalEpisodes.text = context.getString(R.string.total_divider, item.totalEpisode)
        }
        // Bind item data to the views
-        typeimage.setImageResource(R.drawable.ic_round_movie_filter_24)
+        typeImage.setImageResource(R.drawable.ic_round_movie_filter_24)
        type.text = item.type
        typeView.visibility = View.VISIBLE
        imageView.setImageURI(item.image)
--- a/app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeFragment.kt
+++ b/app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeFragment.kt
@ -4,10 +4,8 @@ package ani.dantotsu.download.anime
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.os.Environment
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@ -22,26 +20,35 @@ import androidx.annotation.OptIn
 import androidx.appcompat.app.AppCompatActivity
 import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.core.view.marginBottom
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.media3.common.util.UnstableApi
 import ani.dantotsu.R
 import ani.dantotsu.bottomBar
 import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.currActivity
 import ani.dantotsu.currContext
 import ani.dantotsu.download.DownloadCompat.Companion.loadMediaCompat
 import ani.dantotsu.download.DownloadCompat.Companion.loadOfflineAnimeModelCompat
 import ani.dantotsu.download.DownloadedType
 import ani.dantotsu.download.DownloadsManager
 import ani.dantotsu.download.DownloadsManager.Companion.compareName
 import ani.dantotsu.download.findValidName
 import ani.dantotsu.getThemeColor
 import ani.dantotsu.initActivity
 import ani.dantotsu.util.Logger
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaDetailsActivity
 import ani.dantotsu.media.MediaType
 import ani.dantotsu.navBarHeight
 import ani.dantotsu.setSafeOnClickListener
 import ani.dantotsu.settings.SettingsDialogFragment
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.snackString
 import ani.dantotsu.util.Logger
 import com.anggrayudi.storage.file.openInputStream
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.imageview.ShapeableImageView
 import com.google.android.material.textfield.TextInputLayout
@ -53,9 +60,13 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.SEpisodeImpl
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SChapterImpl
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.File
 class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
@ -64,6 +75,7 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
    private lateinit var gridView: GridView
    private lateinit var adapter: OfflineAnimeAdapter
    private lateinit var total: TextView
    private var downloadsJob: Job = Job()
    override fun onCreateView(
        inflater: LayoutInflater,
@ -79,9 +91,7 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
        textInputLayout.boxBackgroundColor = semiTransparentColor
        val materialCardView = view.findViewById<MaterialCardView>(R.id.offlineMangaAvatarContainer)
        materialCardView.setCardBackgroundColor(semiTransparentColor)
-        val typedValue = TypedValue()
+        val color = requireContext().getThemeColor(android.R.attr.windowBackground)
        requireContext().theme?.resolveAttribute(android.R.attr.windowBackground, typedValue, true)
        val color = typedValue.data
        val animeUserAvatar = view.findViewById<ShapeableImageView>(R.id.offlineMangaUserAvatar)
        animeUserAvatar.setSafeOnClickListener {
@ -110,10 +120,10 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
        })
        var style: Int = PrefManager.getVal(PrefName.OfflineView)
        val layoutList = view.findViewById<ImageView>(R.id.downloadedList)
-        val layoutcompact = view.findViewById<ImageView>(R.id.downloadedGrid)
+        val layoutCompact = view.findViewById<ImageView>(R.id.downloadedGrid)
        var selected = when (style) {
            0 -> layoutList
-            1 -> layoutcompact
+            1 -> layoutCompact
            else -> layoutList
        }
        selected.alpha = 1f
@ -134,7 +144,7 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
            grid()
        }
-        layoutcompact.setOnClickListener {
+        layoutCompact.setOnClickListener {
            selected(it as ImageView)
            style = 1
            PrefManager.setVal(PrefName.OfflineView, style)
@ -154,11 +164,11 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
    @OptIn(UnstableApi::class)
    private fun grid() {
        gridView.visibility = View.VISIBLE
        getDownloads()
        val fadeIn = AlphaAnimation(0f, 1f)
        fadeIn.duration = 300 // animations  pog
        gridView.layoutAnimation = LayoutAnimationController(fadeIn)
        adapter = OfflineAnimeAdapter(requireContext(), downloads, this)
        getDownloads()
        gridView.adapter = adapter
        gridView.scheduleLayoutAnimation()
        total.text = if (gridView.count > 0) "Anime (${gridView.count})" else "Empty List"
@ -166,12 +176,13 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
            // Get the OfflineAnimeModel that was clicked
            val item = adapter.getItem(position) as OfflineAnimeModel
            val media =
-                downloadManager.animeDownloadedTypes.firstOrNull { it.title == item.title }
+                downloadManager.animeDownloadedTypes.firstOrNull { it.titleName.compareName(item.title) }
            media?.let {
                lifecycleScope.launch {
                    val mediaModel = getMedia(it)
                    if (mediaModel == null) {
                        snackString("Error loading media.json")
-                    return@let
+                        return@launch
                    }
                    MediaDetailsActivity.mediaSingleton = mediaModel
                    ContextCompat.startActivity(
@ -180,6 +191,7 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
                            .putExtra("download", true),
                        null
                    )
                }
            } ?: run {
                snackString("no media found")
            }
@ -187,8 +199,7 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
        gridView.setOnItemLongClickListener { _, _, position, _ ->
            // Get the OfflineAnimeModel that was clicked
            val item = adapter.getItem(position) as OfflineAnimeModel
-            val type: DownloadedType.Type =
+            val type: MediaType = MediaType.ANIME
                DownloadedType.Type.ANIME
            // Alert dialog to confirm deletion
            val builder =
@ -203,13 +214,7 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
                if (mediaIds.isEmpty()) {
                    snackString("No media found")  // if this happens, terrible things have happened
                }
                for (mediaId in mediaIds) {
                    ani.dantotsu.download.video.Helper.downloadManager(requireContext())
                        .removeDownload(mediaId.toString())
                }
                getDownloads()
                adapter.setItems(downloads)
                total.text = if (gridView.count > 0) "Anime (${gridView.count})" else "Empty List"
            }
            builder.setNegativeButton("No") { _, _ ->
                // Do nothing
@ -237,7 +242,6 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
        gridView.setOnScrollListener(object : AbsListView.OnScrollListener {
            override fun onScrollStateChanged(view: AbsListView, scrollState: Int) {
                // Implement behavior for different scroll states if needed
            }
            override fun onScroll(
@ -250,7 +254,7 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
                val visibility = first != null && first.top < 0
                scrollTop.translationY =
                    -(navBarHeight + bottomBar.height + bottomBar.marginBottom).toFloat()
-                scrollTop.visibility = if (visibility) View.VISIBLE else View.GONE
+                scrollTop.isVisible = visibility
            }
        })
        initActivity(requireActivity())
@ -260,7 +264,6 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
    override fun onResume() {
        super.onResume()
        getDownloads()
        adapter.notifyDataSetChanged()
    }
    override fun onPause() {
@ -280,29 +283,40 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
    private fun getDownloads() {
        downloads = listOf()
-        val animeTitles = downloadManager.animeDownloadedTypes.map { it.title }.distinct()
+        if (downloadsJob.isActive) {
            downloadsJob.cancel()
        }
        downloadsJob = Job()
        CoroutineScope(Dispatchers.IO + downloadsJob).launch {
            val animeTitles = downloadManager.animeDownloadedTypes.map { it.titleName.findValidName() }.distinct()
            val newAnimeDownloads = mutableListOf<OfflineAnimeModel>()
            for (title in animeTitles) {
-            val tDownloads = downloadManager.animeDownloadedTypes.filter { it.title == title }
+                val tDownloads = downloadManager.animeDownloadedTypes.filter { it.titleName.findValidName() == title }
-            val download = tDownloads.first()
+                val download = tDownloads.firstOrNull() ?: continue
                val offlineAnimeModel = loadOfflineAnimeModel(download)
                if (offlineAnimeModel.title == "unknown") offlineAnimeModel.title = title
                newAnimeDownloads += offlineAnimeModel
            }
            downloads = newAnimeDownloads
            withContext(Dispatchers.Main) {
                adapter.setItems(downloads)
                total.text = if (gridView.count > 0) "Anime (${gridView.count})" else "Empty List"
                adapter.notifyDataSetChanged()
            }
        }
    }
-    private fun getMedia(downloadedType: DownloadedType): Media? {
+    /**
-        val type = when (downloadedType.type) {
+     * Load media.json file from the directory and convert it to Media class
-            DownloadedType.Type.MANGA -> "Manga"
+     * @param downloadedType DownloadedType object
-            DownloadedType.Type.ANIME -> "Anime"
+     * @return Media object
-            else -> "Novel"
+     */
-        }
+    private suspend fun getMedia(downloadedType: DownloadedType): Media? {
        val directory = File(
            currContext()?.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
            "Dantotsu/$type/${downloadedType.title}"
        )
        //load media.json and convert to media class with gson
        return try {
            val directory = DownloadsManager.getSubDirectory(
                context ?: currContext()!!, downloadedType.type,
                false, downloadedType.titleName
            )
            val gson = GsonBuilder()
                .registerTypeAdapter(SChapter::class.java, InstanceCreator<SChapter> {
                    SChapterImpl() // Provide an instance of SChapterImpl
@ -314,8 +328,13 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
                    SEpisodeImpl() // Provide an instance of SEpisodeImpl
                })
                .create()
-            val media = File(directory, "media.json")
+            val media = directory?.findFile("media.json")
-            val mediaJson = media.readText()
+                ?: return loadMediaCompat(downloadedType)
            val mediaJson =
                media.openInputStream(context ?: currContext()!!)?.bufferedReader().use {
                    it?.readText()
                }
                    ?: return null
            gson.fromJson(mediaJson, Media::class.java)
        } catch (e: Exception) {
            Logger.log("Error loading media.json: ${e.message}")
@ -325,27 +344,28 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
        }
    }
-    private fun loadOfflineAnimeModel(downloadedType: DownloadedType): OfflineAnimeModel {
+    /**
-        val type = when (downloadedType.type) {
+     * Load OfflineAnimeModel from the directory
-            DownloadedType.Type.MANGA -> "Manga"
+     * @param downloadedType DownloadedType object
-            DownloadedType.Type.ANIME -> "Anime"
+     * @return OfflineAnimeModel object
-            else -> "Novel"
+     */
-        }
+    private suspend fun loadOfflineAnimeModel(downloadedType: DownloadedType): OfflineAnimeModel {
-        val directory = File(
+        val type = downloadedType.type.asText()
            currContext()?.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
            "Dantotsu/$type/${downloadedType.title}"
        )
        //load media.json and convert to media class with gson
        try {
            val directory = DownloadsManager.getSubDirectory(
                context ?: currContext()!!, downloadedType.type,
                false, downloadedType.titleName
            )
            val mediaModel = getMedia(downloadedType)!!
-            val cover = File(directory, "cover.jpg")
+            val cover = directory?.findFile("cover.jpg")
-            val coverUri: Uri? = if (cover.exists()) {
+            val coverUri: Uri? = if (cover?.exists() == true) {
-                Uri.fromFile(cover)
+                cover.uri
            } else null
-            val banner = File(directory, "banner.jpg")
+            val banner = directory?.findFile("banner.jpg")
-            val bannerUri: Uri? = if (banner.exists()) {
+            val bannerUri: Uri? = if (banner?.exists() == true) {
-                Uri.fromFile(banner)
+                banner.uri
            } else null
            if (coverUri == null && bannerUri == null) throw Exception("No cover or banner found, probably compat")
            val title = mediaModel.mainName()
            val score = ((if (mediaModel.userScore == 0) (mediaModel.meanScore
                ?: 0) else mediaModel.userScore) / 10.0).toString()
@ -373,11 +393,14 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
                coverUri,
                bannerUri
            )
        } catch (e: Exception) {
            return try {
                loadOfflineAnimeModelCompat(downloadedType)
            } catch (e: Exception) {
                Logger.log("Error loading media.json: ${e.message}")
                Logger.log(e)
                Injekt.get<CrashlyticsInterface>().logException(e)
-            return OfflineAnimeModel(
+                OfflineAnimeModel(
                    "unknown",
                    "0",
                    "??",
@ -392,6 +415,7 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
                )
            }
        }
    }
 }
 interface OfflineAnimeSearchListener {
--- a/app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeModel.kt
+++ b/app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeModel.kt
@ -3,7 +3,7 @@ package ani.dantotsu.download.anime
 import android.net.Uri
 data class OfflineAnimeModel(
-    val title: String,
+    var title: String,
    val score: String,
    val totalEpisode: String,
    val totalEpisodeList: String,
--- a/app/src/main/java/ani/dantotsu/download/manga/MangaDownloaderService.kt
+++ b/app/src/main/java/ani/dantotsu/download/manga/MangaDownloaderService.kt
@ -10,19 +10,20 @@ import android.content.pm.PackageManager
 import android.content.pm.ServiceInfo
 import android.graphics.Bitmap
 import android.os.Build
 import android.os.Environment
 import android.os.IBinder
 import android.widget.Toast
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import androidx.documentfile.provider.DocumentFile
 import ani.dantotsu.R
 import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.download.DownloadedType
 import ani.dantotsu.download.DownloadsManager
-import ani.dantotsu.util.Logger
+import ani.dantotsu.download.DownloadsManager.Companion.getSubDirectory
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaType
 import ani.dantotsu.media.manga.ImageData
 import ani.dantotsu.media.manga.MangaReadFragment.Companion.ACTION_DOWNLOAD_FAILED
 import ani.dantotsu.media.manga.MangaReadFragment.Companion.ACTION_DOWNLOAD_FINISHED
@ -30,6 +31,10 @@ import ani.dantotsu.media.manga.MangaReadFragment.Companion.ACTION_DOWNLOAD_PROG
 import ani.dantotsu.media.manga.MangaReadFragment.Companion.ACTION_DOWNLOAD_STARTED
 import ani.dantotsu.media.manga.MangaReadFragment.Companion.EXTRA_CHAPTER_NUMBER
 import ani.dantotsu.snackString
 import ani.dantotsu.util.Logger
 import com.anggrayudi.storage.file.deleteRecursively
 import com.anggrayudi.storage.file.forceDelete
 import com.anggrayudi.storage.file.openOutputStream
 import com.google.gson.GsonBuilder
 import com.google.gson.InstanceCreator
 import eu.kanade.tachiyomi.data.notification.Notifications.CHANNEL_DOWNLOADER_PROGRESS
@ -39,7 +44,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.async
@ -51,8 +55,6 @@ import kotlinx.coroutines.withContext
 import tachiyomi.core.util.lang.launchIO
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.File
 import java.io.FileOutputStream
 import java.net.HttpURLConnection
 import java.net.URL
 import java.util.Queue
@ -189,13 +191,20 @@ class MangaDownloaderService : Service() {
                    true
                }
                //val deferredList = mutableListOf<Deferred<Bitmap?>>()
                val deferredMap = mutableMapOf<Int, Deferred<Bitmap?>>()
                builder.setContentText("Downloading ${task.title} - ${task.chapter}")
                if (notifi) {
                    notificationManager.notify(NOTIFICATION_ID, builder.build())
                }
                getSubDirectory(
                    this@MangaDownloaderService,
                    MediaType.MANGA,
                    false,
                    task.title,
                    task.chapter
                )?.deleteRecursively(this@MangaDownloaderService)
                // Loop through each ImageData object from the task
                var farthest = 0
                for ((index, image) in task.imageData.withIndex()) {
@ -211,8 +220,7 @@ class MangaDownloaderService : Service() {
                        while (bitmap == null && retryCount < task.retries) {
                            bitmap = image.fetchAndProcessImage(
                                image.page,
-                                image.source,
+                                image.source
                                this@MangaDownloaderService
                            )
                            retryCount++
                        }
@ -246,7 +254,7 @@ class MangaDownloaderService : Service() {
                    DownloadedType(
                        task.title,
                        task.chapter,
-                        DownloadedType.Type.MANGA
+                        MediaType.MANGA
                    )
                )
                broadcastDownloadFinished(task.chapter)
@ -264,24 +272,18 @@ class MangaDownloaderService : Service() {
    private fun saveToDisk(fileName: String, bitmap: Bitmap, title: String, chapter: String) {
        try {
            // Define the directory within the private external storage space
-            val directory = File(
+            val directory = getSubDirectory(this, MediaType.MANGA, false, title, chapter)
-                this.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
+                ?: throw Exception("Directory not found")
-                "Dantotsu/Manga/$title/$chapter"
+            directory.findFile(fileName)?.forceDelete(this)
-            )
+            // Create a file reference within that directory for the image
-
+            val file =
-            if (!directory.exists()) {
+                directory.createFile("image/jpeg", fileName) ?: throw Exception("File not created")
                directory.mkdirs()
            }
            // Create a file reference within that directory for your image
            val file = File(directory, fileName)
            // Use a FileOutputStream to write the bitmap to the file
-            FileOutputStream(file).use { outputStream ->
+            file.openOutputStream(this, false).use { outputStream ->
                if (outputStream == null) throw Exception("Output stream is null")
                bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream)
            }
        } catch (e: Exception) {
            println("Exception while saving image: ${e.message}")
            snackString("Exception while saving image: ${e.message}")
@ -292,13 +294,12 @@ class MangaDownloaderService : Service() {
    @OptIn(DelicateCoroutinesApi::class)
    private fun saveMediaInfo(task: DownloadTask) {
        launchIO {
-            val directory = File(
+            val directory =
-                getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
+                getSubDirectory(this@MangaDownloaderService, MediaType.MANGA, false, task.title)
-                "Dantotsu/Manga/${task.title}"
+                    ?: throw Exception("Directory not found")
-            )
+            directory.findFile("media.json")?.forceDelete(this@MangaDownloaderService)
-            if (!directory.exists()) directory.mkdirs()
+            val file = directory.createFile("application/json", "media.json")
-
+                ?: throw Exception("File not created")
            val file = File(directory, "media.json")
            val gson = GsonBuilder()
                .registerTypeAdapter(SChapter::class.java, InstanceCreator<SChapter> {
                    SChapterImpl() // Provide an instance of SChapterImpl
@ -313,7 +314,10 @@ class MangaDownloaderService : Service() {
                val jsonString = gson.toJson(media)
                withContext(Dispatchers.Main) {
                    try {
-                        file.writeText(jsonString)
+                        file.openOutputStream(this@MangaDownloaderService, false).use { output ->
                            if (output == null) throw Exception("Output stream is null")
                            output.write(jsonString.toByteArray())
                        }
                    } catch (e: android.system.ErrnoException) {
                        e.printStackTrace()
                        Toast.makeText(
@ -328,7 +332,7 @@ class MangaDownloaderService : Service() {
    }
-    private suspend fun downloadImage(url: String, directory: File, name: String): String? =
+    private suspend fun downloadImage(url: String, directory: DocumentFile, name: String): String? =
        withContext(Dispatchers.IO) {
            var connection: HttpURLConnection? = null
            println("Downloading url $url")
@ -338,14 +342,16 @@ class MangaDownloaderService : Service() {
                if (connection.responseCode != HttpURLConnection.HTTP_OK) {
                    throw Exception("Server returned HTTP ${connection.responseCode} ${connection.responseMessage}")
                }
-
+                directory.findFile(name)?.forceDelete(this@MangaDownloaderService)
-                val file = File(directory, name)
+                val file =
-                FileOutputStream(file).use { output ->
+                    directory.createFile("image/jpeg", name) ?: throw Exception("File not created")
                file.openOutputStream(this@MangaDownloaderService, false).use { output ->
                    if (output == null) throw Exception("Output stream is null")
                    connection.inputStream.use { input ->
                        input.copyTo(output)
                    }
                }
-                return@withContext file.absolutePath
+                return@withContext file.uri.toString()
            } catch (e: Exception) {
                e.printStackTrace()
                withContext(Dispatchers.Main) {
--- a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaAdapter.kt
@ -1,6 +1,5 @@
 package ani.dantotsu.download.manga
 import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
@ -37,7 +36,6 @@ class OfflineMangaAdapter(
        return position.toLong()
    }
    @SuppressLint("SetTextI18n")
    override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
        val view: View = convertView ?: when (style) {
@ -50,7 +48,6 @@ class OfflineMangaAdapter(
        val imageView = view.findViewById<ImageView>(R.id.itemCompactImage)
        val titleTextView = view.findViewById<TextView>(R.id.itemCompactTitle)
        val itemScore = view.findViewById<TextView>(R.id.itemCompactScore)
        val itemScoreBG = view.findViewById<View>(R.id.itemCompactScoreBG)
        val ongoing = view.findViewById<CardView>(R.id.itemCompactOngoing)
        val totalChapter = view.findViewById<TextView>(R.id.itemCompactTotal)
        val typeImage = view.findViewById<ImageView>(R.id.itemCompactTypeImage)
@ -60,14 +57,15 @@ class OfflineMangaAdapter(
        if (style == 0) {
            val bannerView = view.findViewById<ImageView>(R.id.itemCompactBanner) // for large view
            val chapters = view.findViewById<TextView>(R.id.itemTotal)
-            chapters.text = " Chapters"
+            val text = " ${context.getString(R.string.chapters)}"
-            bannerView.setImageURI(item.banner)
+            chapters.text = text
            bannerView.setImageURI(item.banner ?: item.image)
            totalChapter.text = item.totalChapter
        } else if (style == 1) {
            val readChapter =
                view.findViewById<TextView>(R.id.itemCompactUserProgress) // for compact view
            readChapter.text = item.readChapter
-            totalChapter.text = " | " + item.totalChapter
+            totalChapter.text = context.getString(R.string.total_divider, item.totalChapter)
        }
        // Bind item data to the views
--- a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt
+++ b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt
@ -3,10 +3,8 @@ package ani.dantotsu.download.manga
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.os.Environment
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@ -20,25 +18,35 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.core.view.marginBottom
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import ani.dantotsu.R
 import ani.dantotsu.bottomBar
 import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.currActivity
 import ani.dantotsu.currContext
 import ani.dantotsu.download.DownloadCompat
 import ani.dantotsu.download.DownloadCompat.Companion.loadOfflineMangaModelCompat
 import ani.dantotsu.download.DownloadedType
 import ani.dantotsu.download.DownloadsManager
 import ani.dantotsu.download.DownloadsManager.Companion.compareName
 import ani.dantotsu.download.DownloadsManager.Companion.getSubDirectory
 import ani.dantotsu.download.findValidName
 import ani.dantotsu.getThemeColor
 import ani.dantotsu.initActivity
 import ani.dantotsu.util.Logger
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaDetailsActivity
 import ani.dantotsu.media.MediaType
 import ani.dantotsu.navBarHeight
 import ani.dantotsu.setSafeOnClickListener
 import ani.dantotsu.settings.SettingsDialogFragment
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.snackString
 import ani.dantotsu.util.Logger
 import com.anggrayudi.storage.file.openInputStream
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.imageview.ShapeableImageView
 import com.google.android.material.textfield.TextInputLayout
@ -46,9 +54,13 @@ import com.google.gson.GsonBuilder
 import com.google.gson.InstanceCreator
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SChapterImpl
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.File
 class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
@ -57,6 +69,7 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
    private lateinit var gridView: GridView
    private lateinit var adapter: OfflineMangaAdapter
    private lateinit var total: TextView
    private var downloadsJob: Job = Job()
    override fun onCreateView(
        inflater: LayoutInflater,
@ -72,9 +85,7 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
        textInputLayout.boxBackgroundColor = semiTransparentColor
        val materialCardView = view.findViewById<MaterialCardView>(R.id.offlineMangaAvatarContainer)
        materialCardView.setCardBackgroundColor(semiTransparentColor)
-        val typedValue = TypedValue()
+        val color = requireContext().getThemeColor(android.R.attr.windowBackground)
        requireContext().theme?.resolveAttribute(android.R.attr.windowBackground, typedValue, true)
        val color = typedValue.data
        val animeUserAvatar = view.findViewById<ShapeableImageView>(R.id.offlineMangaUserAvatar)
        animeUserAvatar.setSafeOnClickListener {
@ -146,11 +157,11 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
    private fun grid() {
        gridView.visibility = View.VISIBLE
        getDownloads()
        val fadeIn = AlphaAnimation(0f, 1f)
        fadeIn.duration = 300 // animations  pog
        gridView.layoutAnimation = LayoutAnimationController(fadeIn)
        adapter = OfflineMangaAdapter(requireContext(), downloads, this)
        getDownloads()
        gridView.adapter = adapter
        gridView.scheduleLayoutAnimation()
        total.text =
@ -159,10 +170,10 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
            // Get the OfflineMangaModel that was clicked
            val item = adapter.getItem(position) as OfflineMangaModel
            val media =
-                downloadManager.mangaDownloadedTypes.firstOrNull { it.title == item.title }
+                downloadManager.mangaDownloadedTypes.firstOrNull { it.titleName.compareName(item.title) }
-                    ?: downloadManager.novelDownloadedTypes.firstOrNull { it.title == item.title }
+                    ?: downloadManager.novelDownloadedTypes.firstOrNull { it.titleName.compareName(item.title) }
            media?.let {
-
+                lifecycleScope.launch {
                    ContextCompat.startActivity(
                        requireActivity(),
                        Intent(requireContext(), MediaDetailsActivity::class.java)
@ -170,6 +181,7 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
                            .putExtra("download", true),
                        null
                    )
                }
            } ?: run {
                snackString("no media found")
            }
@ -178,11 +190,11 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
        gridView.setOnItemLongClickListener { _, _, position, _ ->
            // Get the OfflineMangaModel that was clicked
            val item = adapter.getItem(position) as OfflineMangaModel
-            val type: DownloadedType.Type =
+            val type: MediaType =
-                if (downloadManager.mangaDownloadedTypes.any { it.title == item.title }) {
+                if (downloadManager.mangaDownloadedTypes.any { it.titleName == item.title }) {
-                    DownloadedType.Type.MANGA
+                    MediaType.MANGA
                } else {
-                    DownloadedType.Type.NOVEL
+                    MediaType.NOVEL
                }
            // Alert dialog to confirm deletion
            val builder =
@ -192,9 +204,6 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
            builder.setPositiveButton("Yes") { _, _ ->
                downloadManager.removeMedia(item.title, type)
                getDownloads()
                adapter.setItems(downloads)
                total.text =
                    if (gridView.count > 0) "Manga and Novels (${gridView.count})" else "Empty List"
            }
            builder.setNegativeButton("No") { _, _ ->
                // Do nothing
@ -223,7 +232,6 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
        gridView.setOnScrollListener(object : AbsListView.OnScrollListener {
            override fun onScrollStateChanged(view: AbsListView, scrollState: Int) {
                // Implement behavior for different scroll states if needed
            }
            override fun onScroll(
@ -234,7 +242,7 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
            ) {
                val first = view.getChildAt(0)
                val visibility = first != null && first.top < 0
-                scrollTop.visibility = if (visibility) View.VISIBLE else View.GONE
+                scrollTop.isVisible = visibility
                scrollTop.translationY =
                    -(navBarHeight + bottomBar.height + bottomBar.marginBottom).toFloat()
            }
@ -246,7 +254,6 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
    override fun onResume() {
        super.onResume()
        getDownloads()
        adapter.notifyDataSetChanged()
    }
    override fun onPause() {
@ -266,46 +273,62 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
    private fun getDownloads() {
        downloads = listOf()
-        val mangaTitles = downloadManager.mangaDownloadedTypes.map { it.title }.distinct()
+        if (downloadsJob.isActive) {
            downloadsJob.cancel()
        }
        downloads = listOf()
        downloadsJob = Job()
        CoroutineScope(Dispatchers.IO + downloadsJob).launch {
            val mangaTitles = downloadManager.mangaDownloadedTypes.map { it.titleName.findValidName() }.distinct()
            val newMangaDownloads = mutableListOf<OfflineMangaModel>()
            for (title in mangaTitles) {
-            val tDownloads = downloadManager.mangaDownloadedTypes.filter { it.title == title }
+                val tDownloads = downloadManager.mangaDownloadedTypes.filter { it.titleName.findValidName() == title }
-            val download = tDownloads.first()
+                val download = tDownloads.firstOrNull() ?: continue
                val offlineMangaModel = loadOfflineMangaModel(download)
                newMangaDownloads += offlineMangaModel
            }
            downloads = newMangaDownloads
-        val novelTitles = downloadManager.novelDownloadedTypes.map { it.title }.distinct()
+            val novelTitles = downloadManager.novelDownloadedTypes.map { it.titleName }.distinct()
            val newNovelDownloads = mutableListOf<OfflineMangaModel>()
            for (title in novelTitles) {
-            val tDownloads = downloadManager.novelDownloadedTypes.filter { it.title == title }
+                val tDownloads = downloadManager.novelDownloadedTypes.filter { it.titleName.findValidName() == title }
-            val download = tDownloads.first()
+                val download = tDownloads.firstOrNull() ?: continue
                val offlineMangaModel = loadOfflineMangaModel(download)
                newNovelDownloads += offlineMangaModel
            }
            downloads += newNovelDownloads
            withContext(Dispatchers.Main) {
                adapter.setItems(downloads)
                total.text =
                    if (gridView.count > 0) "Manga and Novels (${gridView.count})" else "Empty List"
                adapter.notifyDataSetChanged()
            }
        }
    }
-    private fun getMedia(downloadedType: DownloadedType): Media? {
+    /**
-        val type = when (downloadedType.type) {
+     * Load media.json file from the directory and convert it to Media class
-            DownloadedType.Type.MANGA -> "Manga"
+     * @param downloadedType DownloadedType object
-            DownloadedType.Type.ANIME -> "Anime"
+     * @return Media object
-            else -> "Novel"
+     */
-        }
+    private suspend fun getMedia(downloadedType: DownloadedType): Media? {
        val directory = File(
            currContext()?.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
            "Dantotsu/$type/${downloadedType.title}"
        )
        //load media.json and convert to media class with gson
        return try {
            val directory = getSubDirectory(
                context ?: currContext()!!, downloadedType.type,
                false, downloadedType.titleName
            )
            val gson = GsonBuilder()
                .registerTypeAdapter(SChapter::class.java, InstanceCreator<SChapter> {
                    SChapterImpl() // Provide an instance of SChapterImpl
                })
                .create()
-            val media = File(directory, "media.json")
+            val media = directory?.findFile("media.json")
-            val mediaJson = media.readText()
+                ?: return DownloadCompat.loadMediaCompat(downloadedType)
            val mediaJson =
                media.openInputStream(context ?: currContext()!!)?.bufferedReader().use {
                    it?.readText()
                }
            gson.fromJson(mediaJson, Media::class.java)
        } catch (e: Exception) {
            Logger.log("Error loading media.json: ${e.message}")
@ -315,41 +338,38 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
        }
    }
-    private fun loadOfflineMangaModel(downloadedType: DownloadedType): OfflineMangaModel {
+    private suspend fun loadOfflineMangaModel(downloadedType: DownloadedType): OfflineMangaModel {
-        val type = when (downloadedType.type) {
+        val type = downloadedType.type.asText()
            DownloadedType.Type.MANGA -> "Manga"
            DownloadedType.Type.ANIME -> "Anime"
            else -> "Novel"
        }
        val directory = File(
            currContext()?.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
            "Dantotsu/$type/${downloadedType.title}"
        )
        //load media.json and convert to media class with gson
        try {
            val directory = getSubDirectory(
                context ?: currContext()!!, downloadedType.type,
                false, downloadedType.titleName
            )
            val mediaModel = getMedia(downloadedType)!!
-            val cover = File(directory, "cover.jpg")
+            val cover = directory?.findFile("cover.jpg")
-            val coverUri: Uri? = if (cover.exists()) {
+            val coverUri: Uri? = if (cover?.exists() == true) {
-                Uri.fromFile(cover)
+                cover.uri
            } else null
-            val banner = File(directory, "banner.jpg")
+            val banner = directory?.findFile("banner.jpg")
-            val bannerUri: Uri? = if (banner.exists()) {
+            val bannerUri: Uri? = if (banner?.exists() == true) {
-                Uri.fromFile(banner)
+                banner.uri
            } else null
            if (coverUri == null && bannerUri == null) throw Exception("No cover or banner found, probably compat")
            val title = mediaModel.mainName()
            val score = ((if (mediaModel.userScore == 0) (mediaModel.meanScore
                ?: 0) else mediaModel.userScore) / 10.0).toString()
            val isOngoing =
                mediaModel.status == currActivity()!!.getString(R.string.status_releasing)
            val isUserScored = mediaModel.userScore != 0
-            val readchapter = (mediaModel.userProgress ?: "~").toString()
+            val readChapter = (mediaModel.userProgress ?: "~").toString()
-            val totalchapter = "${mediaModel.manga?.totalChapters ?: "??"}"
+            val totalChapter = "${mediaModel.manga?.totalChapters ?: "??"}"
            val chapters = " Chapters"
            return OfflineMangaModel(
                title,
                score,
-                totalchapter,
+                totalChapter,
-                readchapter,
+                readChapter,
                type,
                chapters,
                isOngoing,
@ -357,6 +377,9 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
                coverUri,
                bannerUri
            )
        } catch (e: Exception) {
            return try {
                loadOfflineMangaModelCompat(downloadedType)
            } catch (e: Exception) {
                Logger.log("Error loading media.json: ${e.message}")
                Logger.log(e)
@ -375,6 +398,7 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
                )
            }
        }
    }
 }
 interface OfflineMangaSearchListener {
--- a/app/src/main/java/ani/dantotsu/download/novel/NovelDownloaderService.kt
+++ b/app/src/main/java/ani/dantotsu/download/novel/NovelDownloaderService.kt
@ -9,21 +9,25 @@ import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.content.pm.ServiceInfo
 import android.os.Build
 import android.os.Environment
 import android.os.IBinder
 import android.widget.Toast
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import androidx.documentfile.provider.DocumentFile
 import ani.dantotsu.R
 import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.download.DownloadedType
 import ani.dantotsu.download.DownloadsManager
-import ani.dantotsu.util.Logger
+import ani.dantotsu.download.DownloadsManager.Companion.getSubDirectory
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaType
 import ani.dantotsu.media.novel.NovelReadFragment
 import ani.dantotsu.snackString
 import ani.dantotsu.util.Logger
 import com.anggrayudi.storage.file.forceDelete
 import com.anggrayudi.storage.file.openOutputStream
 import com.google.gson.GsonBuilder
 import com.google.gson.InstanceCreator
 import eu.kanade.tachiyomi.data.notification.Notifications
@ -33,7 +37,6 @@ import eu.kanade.tachiyomi.source.model.SChapterImpl
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
@ -46,8 +49,6 @@ import okio.sink
 import tachiyomi.core.util.lang.launchIO
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
 import java.net.HttpURLConnection
 import java.net.URL
@ -64,7 +65,7 @@ class NovelDownloaderService : Service() {
    private val mutex = Mutex()
    private var isCurrentlyProcessing = false
-    val networkHelper = Injekt.get<NetworkHelper>()
+    private val networkHelper = Injekt.get<NetworkHelper>()
    override fun onBind(intent: Intent?): IBinder? {
        // This is only required for bound services.
@ -247,27 +248,30 @@ class NovelDownloaderService : Service() {
                        networkHelper.downloadClient.newCall(request).execute().use { response ->
                            // Ensure the response is successful and has a body
-                            if (!response.isSuccessful || response.body == null) {
+                            if (!response.isSuccessful) {
                                throw IOException("Failed to download file: ${response.message}")
                            }
                            val directory = getSubDirectory(
                                this@NovelDownloaderService,
                                MediaType.NOVEL,
                                false,
                                task.title,
                                task.chapter
                            ) ?: throw Exception("Directory not found")
                            directory.findFile("0.epub")?.forceDelete(this@NovelDownloaderService)
-                            val file = File(
+                            val file = directory.createFile("application/epub+zip", "0.epub")
-                                this@NovelDownloaderService.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
+                                ?: throw Exception("File not created")
                                "Dantotsu/Novel/${task.title}/${task.chapter}/0.epub"
                            )
                            // Create directories if they don't exist
                            file.parentFile?.takeIf { !it.exists() }?.mkdirs()
                            // Overwrite existing file
                            if (file.exists()) file.delete()
                            //download cover
                            task.coverUrl?.let {
                                file.parentFile?.let { it1 -> downloadImage(it, it1, "cover.jpg") }
                            }
                            val outputStream =
                                this@NovelDownloaderService.contentResolver.openOutputStream(file.uri)
                                    ?: throw Exception("Could not open OutputStream")
-                            val sink = file.sink().buffer()
+                            val sink = outputStream.sink().buffer()
                            val responseBody = response.body
                            val totalBytes = responseBody.contentLength()
                            var downloadedBytes = 0L
@ -335,7 +339,7 @@ class NovelDownloaderService : Service() {
                    DownloadedType(
                        task.title,
                        task.chapter,
-                        DownloadedType.Type.NOVEL
+                        MediaType.NOVEL
                    )
                )
                broadcastDownloadFinished(task.originalLink)
@ -352,13 +356,16 @@ class NovelDownloaderService : Service() {
    @OptIn(DelicateCoroutinesApi::class)
    private fun saveMediaInfo(task: DownloadTask) {
        launchIO {
-            val directory = File(
+            val directory =
-                getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
+                getSubDirectory(
-                "Dantotsu/Novel/${task.title}"
+                    this@NovelDownloaderService,
-            )
+                    MediaType.NOVEL,
-            if (!directory.exists()) directory.mkdirs()
+                    false,
-
+                    task.title
-            val file = File(directory, "media.json")
+                ) ?: throw Exception("Directory not found")
            directory.findFile("media.json")?.forceDelete(this@NovelDownloaderService)
            val file = directory.createFile("application/json", "media.json")
                ?: throw Exception("File not created")
            val gson = GsonBuilder()
                .registerTypeAdapter(SChapter::class.java, InstanceCreator<SChapter> {
                    SChapterImpl() // Provide an instance of SChapterImpl
@ -372,33 +379,47 @@ class NovelDownloaderService : Service() {
                val jsonString = gson.toJson(media)
                withContext(Dispatchers.Main) {
-                    file.writeText(jsonString)
+                    try {
                        file.openOutputStream(this@NovelDownloaderService, false).use { output ->
                            if (output == null) throw Exception("Output stream is null")
                            output.write(jsonString.toByteArray())
                        }
                    } catch (e: android.system.ErrnoException) {
                        e.printStackTrace()
                        Toast.makeText(
                            this@NovelDownloaderService,
                            "Error while saving: ${e.localizedMessage}",
                            Toast.LENGTH_LONG
                        ).show()
                    }
                }
            }
        }
    }
-    private suspend fun downloadImage(url: String, directory: File, name: String): String? =
+    private suspend fun downloadImage(url: String, directory: DocumentFile, name: String): String? =
        withContext(
            Dispatchers.IO
        ) {
            var connection: HttpURLConnection? = null
-            println("Downloading url $url")
+            Logger.log("Downloading url $url")
            try {
                connection = URL(url).openConnection() as HttpURLConnection
                connection.connect()
                if (connection.responseCode != HttpURLConnection.HTTP_OK) {
                    throw Exception("Server returned HTTP ${connection.responseCode} ${connection.responseMessage}")
                }
-
+                directory.findFile(name)?.forceDelete(this@NovelDownloaderService)
-                val file = File(directory, name)
+                val file =
-                FileOutputStream(file).use { output ->
+                    directory.createFile("image/jpeg", name) ?: throw Exception("File not created")
                file.openOutputStream(this@NovelDownloaderService, false).use { output ->
                    if (output == null) throw Exception("Output stream is null")
                    connection.inputStream.use { input ->
                        input.copyTo(output)
                    }
                }
-                return@withContext file.absolutePath
+                return@withContext file.uri.toString()
            } catch (e: Exception) {
                e.printStackTrace()
                withContext(Dispatchers.Main) {
@ -473,7 +494,6 @@ class NovelDownloaderService : Service() {
 }
 object NovelServiceDataSingleton {
    var sourceMedia: Media? = null
    var downloadQueue: Queue<NovelDownloaderService.DownloadTask> = ConcurrentLinkedQueue()
    @Volatile
--- a/app/src/main/java/ani/dantotsu/download/video/ExoplayerDownloadService.kt
+++ b/app/src/main/java/ani/dantotsu/download/video/ExoplayerDownloadService.kt
@ -1,37 +0,0 @@
 package ani.dantotsu.download.video
 import android.app.Notification
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.offline.Download
 import androidx.media3.exoplayer.offline.DownloadManager
 import androidx.media3.exoplayer.offline.DownloadNotificationHelper
 import androidx.media3.exoplayer.offline.DownloadService
 import androidx.media3.exoplayer.scheduler.PlatformScheduler
 import androidx.media3.exoplayer.scheduler.Scheduler
 import ani.dantotsu.R
@UnstableApi
 class ExoplayerDownloadService :
    DownloadService(1, 2000, "download_service", R.string.downloads, 0) {
    companion object {
        private const val JOB_ID = 1
        private const val FOREGROUND_NOTIFICATION_ID = 1
    }
    override fun getDownloadManager(): DownloadManager = Helper.downloadManager(this)
    override fun getScheduler(): Scheduler = PlatformScheduler(this, JOB_ID)
    override fun getForegroundNotification(
        downloads: MutableList<Download>,
        notMetRequirements: Int
    ): Notification =
        DownloadNotificationHelper(this, "download_service").buildProgressNotification(
            this,
            R.drawable.mono,
            null,
            null,
            downloads,
            notMetRequirements
        )
 }
--- a/app/src/main/java/ani/dantotsu/download/video/Helper.kt
+++ b/app/src/main/java/ani/dantotsu/download/video/Helper.kt
@ -7,15 +7,10 @@ import android.app.AlertDialog
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.util.Log
 import androidx.annotation.OptIn
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.media3.common.C
 import androidx.media3.common.MediaItem
 import androidx.media3.common.MimeTypes
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.database.StandaloneDatabaseProvider
 import androidx.media3.datasource.DataSource
@ -23,11 +18,8 @@ import androidx.media3.datasource.HttpDataSource
 import androidx.media3.datasource.cache.NoOpCacheEvictor
 import androidx.media3.datasource.cache.SimpleCache
 import androidx.media3.datasource.okhttp.OkHttpDataSource
 import androidx.media3.exoplayer.DefaultRenderersFactory
 import androidx.media3.exoplayer.offline.Download
 import androidx.media3.exoplayer.offline.DownloadHelper
 import androidx.media3.exoplayer.offline.DownloadManager
 import androidx.media3.exoplayer.offline.DownloadService
 import androidx.media3.exoplayer.scheduler.Requirements
 import ani.dantotsu.R
 import ani.dantotsu.defaultHeaders
@ -35,93 +27,103 @@ import ani.dantotsu.download.DownloadedType
 import ani.dantotsu.download.DownloadsManager
 import ani.dantotsu.download.anime.AnimeDownloaderService
 import ani.dantotsu.download.anime.AnimeServiceDataSingleton
 import ani.dantotsu.logError
 import ani.dantotsu.media.Media
-import ani.dantotsu.okHttpClient
+import ani.dantotsu.media.MediaType
 import ani.dantotsu.parsers.Subtitle
 import ani.dantotsu.parsers.SubtitleType
 import ani.dantotsu.parsers.Video
 import ani.dantotsu.parsers.VideoType
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.util.Logger
 import eu.kanade.tachiyomi.network.NetworkHelper
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.File
-import java.io.IOException
+import java.util.concurrent.Executors
 import java.util.concurrent.*
@SuppressLint("UnsafeOptInUsageError")
 object Helper {
-
+    @OptIn(UnstableApi::class)
-    private var simpleCache: SimpleCache? = null
+    fun startAnimeDownloadService(
-
+        context: Context,
-    @SuppressLint("UnsafeOptInUsageError")
+        title: String,
-    fun downloadVideo(context: Context, video: Video, subtitle: Subtitle?) {
+        episode: String,
-        val dataSourceFactory = DataSource.Factory {
+        video: Video,
-            val dataSource: HttpDataSource =
+        subtitle: List<Pair<String, String>> = emptyList(),
-                OkHttpDataSource.Factory(okHttpClient).createDataSource()
+        audio: List<Pair<String, String>> = emptyList(),
-            defaultHeaders.forEach {
+        sourceMedia: Media? = null,
-                dataSource.setRequestProperty(it.key, it.value)
+        episodeImage: String? = null
-            }
+    ) {
-            video.file.headers.forEach {
+        if (!isNotificationPermissionGranted(context)) {
-                dataSource.setRequestProperty(it.key, it.value)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            }
+                ActivityCompat.requestPermissions(
-            dataSource
+                    context as Activity,
-        }
+                    arrayOf(Manifest.permission.POST_NOTIFICATIONS),
-        val mimeType = when (video.format) {
+                    1
            VideoType.M3U8 -> MimeTypes.APPLICATION_M3U8
            VideoType.DASH -> MimeTypes.APPLICATION_MPD
            else -> MimeTypes.APPLICATION_MP4
        }
        val builder = MediaItem.Builder().setUri(video.file.url).setMimeType(mimeType)
        var sub: MediaItem.SubtitleConfiguration? = null
        if (subtitle != null) {
            sub = MediaItem.SubtitleConfiguration
                .Builder(Uri.parse(subtitle.file.url))
                .setSelectionFlags(C.SELECTION_FLAG_FORCED)
                .setMimeType(
                    when (subtitle.type) {
                        SubtitleType.VTT -> MimeTypes.TEXT_VTT
                        SubtitleType.ASS -> MimeTypes.TEXT_SSA
                        SubtitleType.SRT -> MimeTypes.APPLICATION_SUBRIP
                        SubtitleType.UNKNOWN -> MimeTypes.TEXT_SSA
                    }
                )
                .build()
            }
-        if (sub != null) builder.setSubtitleConfigurations(mutableListOf(sub))
+        }
-        val mediaItem = builder.build()
+
-        val downloadHelper = DownloadHelper.forMediaItem(
+        val animeDownloadTask = AnimeDownloaderService.AnimeDownloadTask(
            title,
            episode,
            video,
            subtitle,
            audio,
            sourceMedia,
            episodeImage
        )
        val downloadsManger = Injekt.get<DownloadsManager>()
        val downloadCheck = downloadsManger
            .queryDownload(title, episode, MediaType.ANIME)
        if (downloadCheck) {
            AlertDialog.Builder(context, R.style.MyPopup)
                .setTitle("Download Exists")
                .setMessage("A download for this episode already exists. Do you want to overwrite it?")
                .setPositiveButton("Yes") { _, _ ->
                    PrefManager.getAnimeDownloadPreferences().edit()
                        .remove(animeDownloadTask.getTaskName())
                        .apply()
                    downloadsManger.removeDownload(
                        DownloadedType(
                            title,
                            episode,
                            MediaType.ANIME
                        )
                    ) {
                        AnimeServiceDataSingleton.downloadQueue.offer(animeDownloadTask)
                        if (!AnimeServiceDataSingleton.isServiceRunning) {
                            val intent = Intent(context, AnimeDownloaderService::class.java)
                            ContextCompat.startForegroundService(context, intent)
                            AnimeServiceDataSingleton.isServiceRunning = true
                        }
                    }
                }
                .setNegativeButton("No") { _, _ -> }
                .show()
        } else {
            AnimeServiceDataSingleton.downloadQueue.offer(animeDownloadTask)
            if (!AnimeServiceDataSingleton.isServiceRunning) {
                val intent = Intent(context, AnimeDownloaderService::class.java)
                ContextCompat.startForegroundService(context, intent)
                AnimeServiceDataSingleton.isServiceRunning = true
            }
        }
    }
    private fun isNotificationPermissionGranted(context: Context): Boolean {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
            return ActivityCompat.checkSelfPermission(
                context,
-            mediaItem,
+                Manifest.permission.POST_NOTIFICATIONS
-            DefaultRenderersFactory(context),
+            ) == PackageManager.PERMISSION_GRANTED
            dataSourceFactory
        )
        downloadHelper.prepare(object : DownloadHelper.Callback {
            override fun onPrepared(helper: DownloadHelper) {
                helper.getDownloadRequest(null).let {
                    DownloadService.sendAddDownload(
                        context,
                        ExoplayerDownloadService::class.java,
                        it,
                        false
                    )
        }
        return true
    }
            override fun onPrepareError(helper: DownloadHelper, e: IOException) {
                logError(e)
            }
        })
    }
    private var download: DownloadManager? = null
    private const val DOWNLOAD_CONTENT_DIRECTORY = "Anime_Downloads"
    @Synchronized
    @UnstableApi
    @Deprecated("exoplayer download manager is no longer used")
    fun downloadManager(context: Context): DownloadManager {
        return download ?: let {
            val database = Injekt.get<StandaloneDatabaseProvider>()
@ -175,96 +177,7 @@ object Helper {
            downloadManager
        }
    }
-
+    @Deprecated("exoplayer download manager is no longer used")
    private var downloadDirectory: File? = null
    @Synchronized
    private fun getDownloadDirectory(context: Context): File {
        if (downloadDirectory == null) {
            downloadDirectory = context.getExternalFilesDir(null)
            if (downloadDirectory == null) {
                downloadDirectory = context.filesDir
            }
        }
        return downloadDirectory!!
    }
    @OptIn(UnstableApi::class)
    fun startAnimeDownloadService(
        context: Context,
        title: String,
        episode: String,
        video: Video,
        subtitle: Subtitle? = null,
        sourceMedia: Media? = null,
        episodeImage: String? = null
    ) {
        if (!isNotificationPermissionGranted(context)) {
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                ActivityCompat.requestPermissions(
                    context as Activity,
                    arrayOf(Manifest.permission.POST_NOTIFICATIONS),
                    1
                )
            }
        }
        val animeDownloadTask = AnimeDownloaderService.AnimeDownloadTask(
            title,
            episode,
            video,
            subtitle,
            sourceMedia,
            episodeImage
        )
        val downloadsManger = Injekt.get<DownloadsManager>()
        val downloadCheck = downloadsManger
            .queryDownload(title, episode, DownloadedType.Type.ANIME)
        if (downloadCheck) {
            AlertDialog.Builder(context, R.style.MyPopup)
                .setTitle("Download Exists")
                .setMessage("A download for this episode already exists. Do you want to overwrite it?")
                .setPositiveButton("Yes") { _, _ ->
                    DownloadService.sendRemoveDownload(
                        context,
                        ExoplayerDownloadService::class.java,
                        PrefManager.getAnimeDownloadPreferences().getString(
                            animeDownloadTask.getTaskName(),
                            ""
                        ) ?: "",
                        false
                    )
                    PrefManager.getAnimeDownloadPreferences().edit()
                        .remove(animeDownloadTask.getTaskName())
                        .apply()
                    downloadsManger.removeDownload(
                        DownloadedType(
                            title,
                            episode,
                            DownloadedType.Type.ANIME
                        )
                    )
                    AnimeServiceDataSingleton.downloadQueue.offer(animeDownloadTask)
                    if (!AnimeServiceDataSingleton.isServiceRunning) {
                        val intent = Intent(context, AnimeDownloaderService::class.java)
                        ContextCompat.startForegroundService(context, intent)
                        AnimeServiceDataSingleton.isServiceRunning = true
                    }
                }
                .setNegativeButton("No") { _, _ -> }
                .show()
        } else {
            AnimeServiceDataSingleton.downloadQueue.offer(animeDownloadTask)
            if (!AnimeServiceDataSingleton.isServiceRunning) {
                val intent = Intent(context, AnimeDownloaderService::class.java)
                ContextCompat.startForegroundService(context, intent)
                AnimeServiceDataSingleton.isServiceRunning = true
            }
        }
    }
    @OptIn(UnstableApi::class)
    fun getSimpleCache(context: Context): SimpleCache {
        return if (simpleCache == null) {
@ -276,14 +189,23 @@ object Helper {
            simpleCache!!
        }
    }
-
+    @Synchronized
-    private fun isNotificationPermissionGranted(context: Context): Boolean {
+    @Deprecated("exoplayer download manager is no longer used")
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+    private fun getDownloadDirectory(context: Context): File {
-            return ActivityCompat.checkSelfPermission(
+        if (downloadDirectory == null) {
-                context,
+            downloadDirectory = context.getExternalFilesDir(null)
-                Manifest.permission.POST_NOTIFICATIONS
+            if (downloadDirectory == null) {
-            ) == PackageManager.PERMISSION_GRANTED
+                downloadDirectory = context.filesDir
            }
        return true
        }
        return downloadDirectory!!
    }
    @Deprecated("exoplayer download manager is no longer used")
    private var download: DownloadManager? = null
    @Deprecated("exoplayer download manager is no longer used")
    private const val DOWNLOAD_CONTENT_DIRECTORY = "Anime_Downloads"
    @Deprecated("exoplayer download manager is no longer used")
    private var simpleCache: SimpleCache? = null
    @Deprecated("exoplayer download manager is no longer used")
    private var downloadDirectory: File? = null
 }
--- a/app/src/main/java/ani/dantotsu/home/AnimeFragment.kt
+++ b/app/src/main/java/ani/dantotsu/home/AnimeFragment.kt
@ -36,6 +36,7 @@ import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.snackString
 import ani.dantotsu.statusBarHeight
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@ -204,7 +205,22 @@ class AnimeFragment : Fragment() {
            if (i) {
                model.getUpdated().observe(viewLifecycleOwner) {
                    if (it != null) {
-                        animePageAdapter.updateRecent(MediaAdaptor(0, it, requireActivity()))
+                        animePageAdapter.updateRecent(MediaAdaptor(0, it, requireActivity()), it)
                    }
                }
                model.getMovies().observe(viewLifecycleOwner) {
                    if (it != null) {
                        animePageAdapter.updateMovies(MediaAdaptor(0, it, requireActivity()), it)
                    }
                }
                model.getTopRated().observe(viewLifecycleOwner) {
                    if (it != null) {
                        animePageAdapter.updateTopRated(MediaAdaptor(0, it, requireActivity()), it)
                    }
                }
                model.getMostFav().observe(viewLifecycleOwner) {
                    if (it != null) {
                        animePageAdapter.updateMostFav(MediaAdaptor(0, it, requireActivity()), it)
                    }
                }
                if (animePageAdapter.trendingViewPager != null) {
@ -253,17 +269,29 @@ class AnimeFragment : Fragment() {
            true
        }
        var running = false
        val live = Refresh.activity.getOrPut(this.hashCode()) { MutableLiveData(false) }
        live.observe(viewLifecycleOwner) {
-            if (it) {
+            if (it && !running) {
                running = true
                scope.launch {
                    withContext(Dispatchers.IO) {
                        Anilist.userid = PrefManager.getNullableVal<String>(PrefName.AnilistUserId, null)
                            ?.toIntOrNull()
                        if (Anilist.userid == null) {
                            getUserId(requireContext()) {
                                load()
                            }
                        } else {
                            CoroutineScope(Dispatchers.IO).launch {
                                getUserId(requireContext()) {
                                    load()
                                }
                            }
                        }
                        model.loaded = true
                        model.loadTrending(1)
-                        model.loadUpdated()
+                        model.loadAll()
                        model.loadPopular(
                            "ANIME", sort = Anilist.sortBy[1], onList = PrefManager.getVal(
                                PrefName.PopularAnimeList
@ -272,6 +300,7 @@ class AnimeFragment : Fragment() {
                    }
                    live.postValue(false)
                    _binding?.animeRefresh?.isRefreshing = false
                    running = false
                }
            }
        }
--- a/app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt
@ -3,15 +3,17 @@ package ani.dantotsu.home
 import android.content.Intent
 import android.os.Handler
 import android.os.Looper
-import android.util.TypedValue
+import android.view.HapticFeedbackConstants
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.LayoutAnimationController
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@ -21,10 +23,15 @@ import ani.dantotsu.R
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.currContext
 import ani.dantotsu.databinding.ItemAnimePageBinding
 import ani.dantotsu.databinding.LayoutTrendingBinding
 import ani.dantotsu.getAppString
 import ani.dantotsu.getThemeColor
 import ani.dantotsu.loadImage
 import ani.dantotsu.media.CalendarActivity
 import ani.dantotsu.media.GenreActivity
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaAdaptor
 import ani.dantotsu.media.MediaListViewActivity
 import ani.dantotsu.media.SearchActivity
 import ani.dantotsu.profile.ProfileActivity
 import ani.dantotsu.px
@ -41,6 +48,7 @@ import com.google.android.material.textfield.TextInputLayout
 class AnimePageAdapter : RecyclerView.Adapter<AnimePageAdapter.AnimePageViewHolder>() {
    val ready = MutableLiveData(false)
    lateinit var binding: ItemAnimePageBinding
    private lateinit var trendingBinding: LayoutTrendingBinding
    private var trendHandler: Handler? = null
    private lateinit var trendRun: Runnable
    var trendingViewPager: ViewPager2? = null
@ -53,32 +61,30 @@ class AnimePageAdapter : RecyclerView.Adapter<AnimePageAdapter.AnimePageViewHold
    override fun onBindViewHolder(holder: AnimePageViewHolder, position: Int) {
        binding = holder.binding
-        trendingViewPager = binding.animeTrendingViewPager
+        trendingBinding = LayoutTrendingBinding.bind(binding.root)
        trendingViewPager = trendingBinding.trendingViewPager
-        val textInputLayout = holder.itemView.findViewById<TextInputLayout>(R.id.animeSearchBar)
+        val textInputLayout = holder.itemView.findViewById<TextInputLayout>(R.id.searchBar)
        val currentColor = textInputLayout.boxBackgroundColor
        val semiTransparentColor = (currentColor and 0x00FFFFFF) or 0xA8000000.toInt()
        textInputLayout.boxBackgroundColor = semiTransparentColor
        val materialCardView =
-            holder.itemView.findViewById<MaterialCardView>(R.id.animeUserAvatarContainer)
+            holder.itemView.findViewById<MaterialCardView>(R.id.userAvatarContainer)
        materialCardView.setCardBackgroundColor(semiTransparentColor)
-        val typedValue = TypedValue()
+        val color = binding.root.context.getThemeColor(android.R.attr.windowBackground)
        currContext()?.theme?.resolveAttribute(android.R.attr.windowBackground, typedValue, true)
        val color = typedValue.data
        textInputLayout.boxBackgroundColor = (color and 0x00FFFFFF) or 0x28000000
        materialCardView.setCardBackgroundColor((color and 0x00FFFFFF) or 0x28000000)
-        binding.animeTitleContainer.updatePadding(top = statusBarHeight)
+        trendingBinding.titleContainer.updatePadding(top = statusBarHeight)
-        if (PrefManager.getVal(PrefName.SmallView)) binding.animeTrendingContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+        if (PrefManager.getVal(PrefName.SmallView)) trendingBinding.trendingContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {
            bottomMargin = (-108f).px
        }
        updateAvatar()
-        binding.animeSearchBar.hint = "ANIME"
+        trendingBinding.searchBar.hint = "ANIME"
-        binding.animeSearchBarText.setOnClickListener {
+        trendingBinding.searchBarText.setOnClickListener {
            ContextCompat.startActivity(
                it.context,
                Intent(it.context, SearchActivity::class.java).putExtra("type", "ANIME"),
@ -86,26 +92,28 @@ class AnimePageAdapter : RecyclerView.Adapter<AnimePageAdapter.AnimePageViewHold
            )
        }
-        binding.animeSearchBar.setEndIconOnClickListener {
+        trendingBinding.userAvatar.setSafeOnClickListener {
            binding.animeSearchBarText.performClick()
        }
        binding.animeUserAvatar.setSafeOnClickListener {
            val dialogFragment =
                SettingsDialogFragment.newInstance(SettingsDialogFragment.Companion.PageType.ANIME)
            dialogFragment.show((it.context as AppCompatActivity).supportFragmentManager, "dialog")
        }
-        binding.animeUserAvatar.setOnLongClickListener { view ->
+        trendingBinding.userAvatar.setOnLongClickListener { view ->
            view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
            ContextCompat.startActivity(
                view.context,
                Intent(view.context, ProfileActivity::class.java)
-                    .putExtra("userId", Anilist.userid),null
+                    .putExtra("userId", Anilist.userid), null
            )
            false
        }
-        binding.animeNotificationCount.visibility = if (Anilist.unreadNotificationCount > 0) View.VISIBLE else View.GONE
+        trendingBinding.searchBar.setEndIconOnClickListener {
-        binding.animeNotificationCount.text = Anilist.unreadNotificationCount.toString()
+            trendingBinding.searchBar.performClick()
        }
        trendingBinding.notificationCount.visibility =
            if (Anilist.unreadNotificationCount > 0) View.VISIBLE else View.GONE
        trendingBinding.notificationCount.text = Anilist.unreadNotificationCount.toString()
        listOf(
            binding.animePreviousSeason,
@ -134,8 +142,7 @@ class AnimePageAdapter : RecyclerView.Adapter<AnimePageAdapter.AnimePageViewHold
            )
        }
-        binding.animeIncludeList.visibility =
+        binding.animeIncludeList.isVisible = Anilist.userid != null
            if (Anilist.userid != null) View.VISIBLE else View.GONE
        binding.animeIncludeList.isChecked = PrefManager.getVal(PrefName.PopularAnimeList)
@ -159,67 +166,137 @@ class AnimePageAdapter : RecyclerView.Adapter<AnimePageAdapter.AnimePageViewHold
    }
    fun updateTrending(adaptor: MediaAdaptor) {
-        binding.animeTrendingProgressBar.visibility = View.GONE
+        trendingBinding.trendingProgressBar.visibility = View.GONE
-        binding.animeTrendingViewPager.adapter = adaptor
+        trendingBinding.trendingViewPager.adapter = adaptor
-        binding.animeTrendingViewPager.offscreenPageLimit = 3
+        trendingBinding.trendingViewPager.offscreenPageLimit = 3
-        binding.animeTrendingViewPager.getChildAt(0).overScrollMode = RecyclerView.OVER_SCROLL_NEVER
+        trendingBinding.trendingViewPager.getChildAt(0).overScrollMode =
-        binding.animeTrendingViewPager.setPageTransformer(MediaPageTransformer())
+            RecyclerView.OVER_SCROLL_NEVER
-
+        trendingBinding.trendingViewPager.setPageTransformer(MediaPageTransformer())
        trendHandler = Handler(Looper.getMainLooper())
        trendRun = Runnable {
-            binding.animeTrendingViewPager.currentItem =
+            trendingBinding.trendingViewPager.currentItem += 1
                binding.animeTrendingViewPager.currentItem + 1
        }
-        binding.animeTrendingViewPager.registerOnPageChangeCallback(
+        trendingBinding.trendingViewPager.registerOnPageChangeCallback(
            object : ViewPager2.OnPageChangeCallback() {
                override fun onPageSelected(position: Int) {
                    super.onPageSelected(position)
-                    trendHandler!!.removeCallbacks(trendRun)
+                    trendHandler?.removeCallbacks(trendRun)
                    if (PrefManager.getVal(PrefName.TrendingScroller)) {
                        trendHandler!!.postDelayed(trendRun, 4000)
                    }
                }
            }
        )
-        binding.animeTrendingViewPager.layoutAnimation =
+        trendingBinding.trendingViewPager.layoutAnimation =
            LayoutAnimationController(setSlideIn(), 0.25f)
-        binding.animeTitleContainer.startAnimation(setSlideUp())
+        trendingBinding.titleContainer.startAnimation(setSlideUp())
        binding.animeListContainer.layoutAnimation =
            LayoutAnimationController(setSlideIn(), 0.25f)
        binding.animeSeasonsCont.layoutAnimation =
            LayoutAnimationController(setSlideIn(), 0.25f)
    }
-    fun updateRecent(adaptor: MediaAdaptor) {
+    fun updateRecent(adaptor: MediaAdaptor, media: MutableList<Media>) {
-        binding.animeUpdatedProgressBar.visibility = View.GONE
+        binding.apply {
-        binding.animeUpdatedRecyclerView.adapter = adaptor
+            init(
-        binding.animeUpdatedRecyclerView.layoutManager =
+                adaptor,
                animeUpdatedRecyclerView,
                animeUpdatedProgressBar,
                animeRecently,
                animeRecentlyMore,
                getAppString(R.string.updated),
                media
            )
            animePopular.visibility = View.VISIBLE
            animePopular.startAnimation(setSlideUp())
            if (adaptor.itemCount == 0) {
                animeRecentlyContainer.visibility = View.GONE
            }
        }
    }
    fun updateMovies(adaptor: MediaAdaptor, media: MutableList<Media>) {
        binding.apply {
            init(
                adaptor,
                animeMoviesRecyclerView,
                animeMoviesProgressBar,
                animeMovies,
                animeMoviesMore,
                getAppString(R.string.trending_movies),
                media
            )
        }
    }
    fun updateTopRated(adaptor: MediaAdaptor, media: MutableList<Media>) {
        binding.apply {
            init(
                adaptor,
                animeTopRatedRecyclerView,
                animeTopRatedProgressBar,
                animeTopRated,
                animeTopRatedMore,
                getAppString(R.string.top_rated),
                media
            )
        }
    }
    fun updateMostFav(adaptor: MediaAdaptor, media: MutableList<Media>) {
        binding.apply {
            init(
                adaptor,
                animeMostFavRecyclerView,
                animeMostFavProgressBar,
                animeMostFav,
                animeMostFavMore,
                getAppString(R.string.most_favourite),
                media
            )
        }
    }
    fun init(adaptor: MediaAdaptor, recyclerView: RecyclerView, progress: View, title: View , more: View , string: String,  media : MutableList<Media>) {
        progress.visibility = View.GONE
        recyclerView.adapter = adaptor
        recyclerView.layoutManager =
            LinearLayoutManager(
-                binding.animeUpdatedRecyclerView.context,
+                recyclerView.context,
                LinearLayoutManager.HORIZONTAL,
                false
            )
-        binding.animeUpdatedRecyclerView.visibility = View.VISIBLE
+        MediaListViewActivity.passedMedia = media.toCollection(ArrayList())
-
+        more.setOnClickListener {
-        binding.animeRecently.visibility = View.VISIBLE
+            ContextCompat.startActivity(
-        binding.animeRecently.startAnimation(setSlideUp())
+                it.context, Intent(it.context, MediaListViewActivity::class.java)
-        binding.animeUpdatedRecyclerView.layoutAnimation =
+                    .putExtra("title", string),
                null
            )
        }
        recyclerView.visibility = View.VISIBLE
        title.visibility = View.VISIBLE
        more.visibility = View.VISIBLE
        title.startAnimation(setSlideUp())
        more.startAnimation(setSlideUp())
        recyclerView.layoutAnimation =
            LayoutAnimationController(setSlideIn(), 0.25f)
        binding.animePopular.visibility = View.VISIBLE
        binding.animePopular.startAnimation(setSlideUp())
    }
    fun updateAvatar() {
        if (Anilist.avatar != null && ready.value == true) {
-            binding.animeUserAvatar.loadImage(Anilist.avatar)
+            trendingBinding.userAvatar.loadImage(Anilist.avatar)
-            binding.animeUserAvatar.imageTintList = null
+            trendingBinding.userAvatar.imageTintList = null
        }
    }
    fun updateNotificationCount() {
        if (this::binding.isInitialized) {
-            binding.animeNotificationCount.visibility =
+            trendingBinding.notificationCount.visibility =
                if (Anilist.unreadNotificationCount > 0) View.VISIBLE else View.GONE
-            binding.animeNotificationCount.text = Anilist.unreadNotificationCount.toString()
+            trendingBinding.notificationCount.text = Anilist.unreadNotificationCount.toString()
        }
    }
--- a/app/src/main/java/ani/dantotsu/home/HomeFragment.kt
+++ b/app/src/main/java/ani/dantotsu/home/HomeFragment.kt
@ -5,11 +5,13 @@ import android.content.Intent
 import android.graphics.drawable.Animatable
 import android.os.Build
 import android.os.Bundle
 import android.view.HapticFeedbackConstants
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.LayoutAnimationController
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
@ -28,9 +30,11 @@ import ani.dantotsu.connections.anilist.AnilistHomeViewModel
 import ani.dantotsu.connections.anilist.getUserId
 import ani.dantotsu.currContext
 import ani.dantotsu.databinding.FragmentHomeBinding
 import ani.dantotsu.home.status.UserStatusAdapter
 import ani.dantotsu.loadImage
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaAdaptor
 import ani.dantotsu.media.MediaListViewActivity
 import ani.dantotsu.media.user.ListActivity
 import ani.dantotsu.navBarHeight
 import ani.dantotsu.profile.ProfileActivity
@ -39,12 +43,14 @@ import ani.dantotsu.setSlideIn
 import ani.dantotsu.setSlideUp
 import ani.dantotsu.settings.SettingsDialogFragment
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefManager.asLiveBool
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.snackString
 import ani.dantotsu.statusBarHeight
 import ani.dantotsu.util.Logger
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import kotlin.math.max
 import kotlin.math.min
@ -53,7 +59,6 @@ import kotlin.math.min
 class HomeFragment : Fragment() {
    private var _binding: FragmentHomeBinding? = null
    private val binding get() = _binding!!
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
@ -72,16 +77,21 @@ class HomeFragment : Fragment() {
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        val scope = lifecycleScope
        Logger.log("HomeFragment")
        fun load() {
            Logger.log("Loading HomeFragment")
            if (activity != null && _binding != null) lifecycleScope.launch(Dispatchers.Main) {
                binding.homeUserName.text = Anilist.username
                binding.homeUserEpisodesWatched.text = Anilist.episodesWatched.toString()
                binding.homeUserChaptersRead.text = Anilist.chapterRead.toString()
                binding.homeUserAvatar.loadImage(Anilist.avatar)
-                if (!(PrefManager.getVal(PrefName.BannerAnimations) as Boolean)) binding.homeUserBg.pause()
+                val bannerAnimations: Boolean = PrefManager.getVal(PrefName.BannerAnimations)
-                blurImage(binding.homeUserBg, Anilist.bg)
+                blurImage(
                    if (bannerAnimations) binding.homeUserBg else binding.homeUserBgNoKen,
                    Anilist.bg
                )
                binding.homeUserDataProgressBar.visibility = View.GONE
-                binding.homeNotificationCount.visibility = if (Anilist.unreadNotificationCount > 0) View.VISIBLE else View.GONE
+                binding.homeNotificationCount.isVisible = Anilist.unreadNotificationCount > 0
                binding.homeNotificationCount.text = Anilist.unreadNotificationCount.toString()
                binding.homeAnimeList.setOnClickListener {
@ -123,9 +133,10 @@ class HomeFragment : Fragment() {
            )
        }
        binding.homeUserAvatarContainer.setOnLongClickListener {
            it.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
            ContextCompat.startActivity(
                requireContext(), Intent(requireContext(), ProfileActivity::class.java)
-                    .putExtra("userId", Anilist.userid),null
+                    .putExtra("userId", Anilist.userid), null
            )
            false
        }
@ -134,6 +145,7 @@ class HomeFragment : Fragment() {
            bottomMargin = navBarHeight
        }
        binding.homeUserBg.updateLayoutParams { height += statusBarHeight }
        binding.homeUserBgNoKen.updateLayoutParams { height += statusBarHeight }
        binding.homeTopContainer.updatePadding(top = statusBarHeight)
        var reached = false
@ -198,13 +210,16 @@ class HomeFragment : Fragment() {
            recyclerView: RecyclerView,
            progress: View,
            empty: View,
-            title: View
+            title: View,
            more: View,
            string: String
        ) {
            container.visibility = View.VISIBLE
            progress.visibility = View.VISIBLE
            recyclerView.visibility = View.GONE
            empty.visibility = View.GONE
            title.visibility = View.INVISIBLE
            more.visibility = View.INVISIBLE
            mode.observe(viewLifecycleOwner) {
                recyclerView.visibility = View.GONE
@ -217,6 +232,14 @@ class HomeFragment : Fragment() {
                            LinearLayoutManager.HORIZONTAL,
                            false
                        )
                        more.setOnClickListener { i ->
                            MediaListViewActivity.passedMedia = it
                            ContextCompat.startActivity(
                                i.context, Intent(i.context, MediaListViewActivity::class.java)
                                    .putExtra("title", string),
                                null
                            )
                        }
                        recyclerView.visibility = View.VISIBLE
                        recyclerView.layoutAnimation =
                            LayoutAnimationController(setSlideIn(), 0.25f)
@ -224,7 +247,9 @@ class HomeFragment : Fragment() {
                    } else {
                        empty.visibility = View.VISIBLE
                    }
                    more.visibility = View.VISIBLE
                    title.visibility = View.VISIBLE
                    more.startAnimation(setSlideUp())
                    title.startAnimation(setSlideUp())
                    progress.visibility = View.GONE
                }
@ -239,7 +264,9 @@ class HomeFragment : Fragment() {
            binding.homeWatchingRecyclerView,
            binding.homeWatchingProgressBar,
            binding.homeWatchingEmpty,
-            binding.homeContinueWatch
+            binding.homeContinueWatch,
            binding.homeContinueWatchMore,
            getString(R.string.continue_watching)
        )
        binding.homeWatchingBrowseButton.setOnClickListener {
            bottomBar.selectTabAt(0)
@ -251,7 +278,9 @@ class HomeFragment : Fragment() {
            binding.homeFavAnimeRecyclerView,
            binding.homeFavAnimeProgressBar,
            binding.homeFavAnimeEmpty,
-            binding.homeFavAnime
+            binding.homeFavAnime,
            binding.homeFavAnimeMore,
            getString(R.string.fav_anime)
        )
        initRecyclerView(
@ -260,7 +289,9 @@ class HomeFragment : Fragment() {
            binding.homePlannedAnimeRecyclerView,
            binding.homePlannedAnimeProgressBar,
            binding.homePlannedAnimeEmpty,
-            binding.homePlannedAnime
+            binding.homePlannedAnime,
            binding.homePlannedAnimeMore,
            getString(R.string.planned_anime)
        )
        binding.homePlannedAnimeBrowseButton.setOnClickListener {
            bottomBar.selectTabAt(0)
@ -272,7 +303,9 @@ class HomeFragment : Fragment() {
            binding.homeReadingRecyclerView,
            binding.homeReadingProgressBar,
            binding.homeReadingEmpty,
-            binding.homeContinueRead
+            binding.homeContinueRead,
            binding.homeContinueReadMore,
            getString(R.string.continue_reading)
        )
        binding.homeReadingBrowseButton.setOnClickListener {
            bottomBar.selectTabAt(2)
@ -284,7 +317,9 @@ class HomeFragment : Fragment() {
            binding.homeFavMangaRecyclerView,
            binding.homeFavMangaProgressBar,
            binding.homeFavMangaEmpty,
-            binding.homeFavManga
+            binding.homeFavManga,
            binding.homeFavMangaMore,
            getString(R.string.fav_manga)
        )
        initRecyclerView(
@ -293,7 +328,9 @@ class HomeFragment : Fragment() {
            binding.homePlannedMangaRecyclerView,
            binding.homePlannedMangaProgressBar,
            binding.homePlannedMangaEmpty,
-            binding.homePlannedManga
+            binding.homePlannedManga,
            binding.homePlannedMangaMore,
            getString(R.string.planned_manga)
        )
        binding.homePlannedMangaBrowseButton.setOnClickListener {
            bottomBar.selectTabAt(2)
@ -305,12 +342,87 @@ class HomeFragment : Fragment() {
            binding.homeRecommendedRecyclerView,
            binding.homeRecommendedProgressBar,
            binding.homeRecommendedEmpty,
-            binding.homeRecommended
+            binding.homeRecommended,
            binding.homeRecommendedMore,
            getString(R.string.recommended)
        )
        binding.homeUserStatusContainer.visibility = View.VISIBLE
        binding.homeUserStatusProgressBar.visibility = View.VISIBLE
        binding.homeUserStatusRecyclerView.visibility = View.GONE
        model.getUserStatus().observe(viewLifecycleOwner) {
            binding.homeUserStatusRecyclerView.visibility = View.GONE
            if (it != null) {
                if (it.isNotEmpty()) {
                    PrefManager.getLiveVal(PrefName.RefreshStatus, false).apply {
                        asLiveBool()
                        observe(viewLifecycleOwner) { _ ->
                            binding.homeUserStatusRecyclerView.adapter = UserStatusAdapter(it)
                        }
                    }
                    binding.homeUserStatusRecyclerView.layoutManager = LinearLayoutManager(
                        requireContext(),
                        LinearLayoutManager.HORIZONTAL,
                        false
                    )
                    binding.homeUserStatusRecyclerView.visibility = View.VISIBLE
                    binding.homeUserStatusRecyclerView.layoutAnimation =
                        LayoutAnimationController(setSlideIn(), 0.25f)
                } else {
                    binding.homeUserStatusContainer.visibility = View.GONE
                }
                binding.homeUserStatusProgressBar.visibility = View.GONE
            }
        }
        binding.homeHiddenItemsContainer.visibility = View.GONE
        model.getHidden().observe(viewLifecycleOwner) {
            if (it != null) {
                if (it.isNotEmpty()) {
                    binding.homeHiddenItemsRecyclerView.adapter =
                        MediaAdaptor(0, it, requireActivity())
                    binding.homeHiddenItemsRecyclerView.layoutManager = LinearLayoutManager(
                        requireContext(),
                        LinearLayoutManager.HORIZONTAL,
                        false
                    )
                    binding.homeContinueWatch.setOnLongClickListener {
                        binding.homeHiddenItemsContainer.visibility = View.VISIBLE
                        binding.homeHiddenItemsRecyclerView.layoutAnimation =
                            LayoutAnimationController(setSlideIn(), 0.25f)
                        true
                    }
                    binding.homeHiddenItemsMore.setSafeOnClickListener { _ ->
                        MediaListViewActivity.passedMedia = it
                        ContextCompat.startActivity(
                            requireActivity(),
                            Intent(requireActivity(), MediaListViewActivity::class.java)
                                .putExtra("title", getString(R.string.hidden)),
                            null
                        )
                    }
                    binding.homeHiddenItemsTitle.setOnLongClickListener {
                        binding.homeHiddenItemsContainer.visibility = View.GONE
                        true
                    }
                } else {
                    binding.homeContinueWatch.setOnLongClickListener {
                        snackString(getString(R.string.no_hidden_items))
                        true
                    }
                }
            } else {
                binding.homeContinueWatch.setOnLongClickListener {
                    snackString(getString(R.string.no_hidden_items))
                    true
                }
            }
        }
        binding.homeUserAvatarContainer.startAnimation(setSlideUp())
-        model.empty.observe(viewLifecycleOwner) {
+        model.empty.observe(viewLifecycleOwner)
        {
            binding.homeDantotsuContainer.visibility = if (it == true) View.VISIBLE else View.GONE
            (binding.homeDantotsuIcon.drawable as Animatable).start()
            binding.homeDantotsuContainer.startAnimation(setSlideUp())
@ -327,7 +439,8 @@ class HomeFragment : Fragment() {
            "MangaContinue",
            "MangaFav",
            "MangaPlanned",
-            "Recommendation"
+            "Recommendation",
            "UserStatus",
        )
        val containers = arrayOf(
@ -337,26 +450,41 @@ class HomeFragment : Fragment() {
            binding.homeContinueReadingContainer,
            binding.homeFavMangaContainer,
            binding.homePlannedMangaContainer,
-            binding.homeRecommendedContainer
+            binding.homeRecommendedContainer,
            binding.homeUserStatusContainer,
        )
-        val live = Refresh.activity.getOrPut(1) { MutableLiveData(false) }
+        var running = false
-        live.observe(viewLifecycleOwner) {
+        val live = Refresh.activity.getOrPut(1) { MutableLiveData(true) }
-            if (it) {
+        live.observe(viewLifecycleOwner)
        {
            if (!running && it) {
                running = true
                scope.launch {
                    withContext(Dispatchers.IO) {
                        //Get userData First
                        Anilist.userid =
                            PrefManager.getNullableVal<String>(PrefName.AnilistUserId, null)
                                ?.toIntOrNull()
                        if (Anilist.userid == null) {
                            getUserId(requireContext()) {
                                load()
                            }
                        } else {
                            CoroutineScope(Dispatchers.IO).launch {
                                getUserId(requireContext()) {
                                    load()
                                }
                            }
                        }
                        model.loaded = true
                        CoroutineScope(Dispatchers.IO).launch {
                            model.setListImages()
                        }
                        var empty = true
                        val homeLayoutShow: List<Boolean> =
-                            PrefManager.getVal(PrefName.HomeLayoutShow)
+                            PrefManager.getVal(PrefName.HomeLayout)
                        runBlocking {
                        model.initHomePage()
                        }
                        (array.indices).forEach { i ->
                            if (homeLayoutShow.elementAt(i)) {
                                empty = false
@ -368,14 +496,18 @@ class HomeFragment : Fragment() {
                    }
                    live.postValue(false)
                    _binding?.homeRefresh?.isRefreshing = false
                    running = false
                }
                binding.homeHiddenItemsContainer.visibility = View.GONE
            }
        }
    }
-        }
+
    }
    override fun onResume() {
        if (!model.loaded) Refresh.activity[1]!!.postValue(true)
        if (_binding != null) {
-            binding.homeNotificationCount.visibility = if (Anilist.unreadNotificationCount > 0) View.VISIBLE else View.GONE
+            binding.homeNotificationCount.isVisible = Anilist.unreadNotificationCount > 0
            binding.homeNotificationCount.text = Anilist.unreadNotificationCount.toString()
        }
        super.onResume()
--- a/app/src/main/java/ani/dantotsu/home/MangaFragment.kt
+++ b/app/src/main/java/ani/dantotsu/home/MangaFragment.kt
@ -33,6 +33,7 @@ import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.snackString
 import ani.dantotsu.statusBarHeight
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@ -160,9 +161,35 @@ class MangaFragment : Fragment() {
        })
        mangaPageAdapter.ready.observe(viewLifecycleOwner) { i ->
            if (i == true) {
-                model.getTrendingNovel().observe(viewLifecycleOwner) {
+                model.getPopularNovel().observe(viewLifecycleOwner) {
                    if (it != null) {
-                        mangaPageAdapter.updateNovel(MediaAdaptor(0, it, requireActivity()))
+                        mangaPageAdapter.updateNovel(MediaAdaptor(0, it, requireActivity()), it)
                    }
                }
                model.getPopularManga().observe(viewLifecycleOwner) {
                    if (it != null) {
                        mangaPageAdapter.updateTrendingManga(MediaAdaptor(0, it, requireActivity()), it)
                    }
                }
                model.getPopularManhwa().observe(viewLifecycleOwner) {
                    if (it != null) {
                        mangaPageAdapter.updateTrendingManhwa(
                            MediaAdaptor(
                                0,
                                it,
                                requireActivity()
                            ), it
                        )
                    }
                }
                model.getTopRated().observe(viewLifecycleOwner) {
                    if (it != null) {
                        mangaPageAdapter.updateTopRated(MediaAdaptor(0, it, requireActivity()), it)
                    }
                }
                model.getMostFav().observe(viewLifecycleOwner) {
                    if (it != null) {
                        mangaPageAdapter.updateMostFav(MediaAdaptor(0, it, requireActivity()), it)
                    }
                }
                if (mangaPageAdapter.trendingViewPager != null) {
@ -227,17 +254,29 @@ class MangaFragment : Fragment() {
            mangaPageAdapter.updateAvatar()
        }
-        val live = Refresh.activity.getOrPut(this.hashCode()) { MutableLiveData(false) }
+        var running = false
        val live = Refresh.activity.getOrPut(this.hashCode()) { MutableLiveData(true) }
        live.observe(viewLifecycleOwner) {
-            if (it) {
+            if (!running && it) {
                running = true
                scope.launch {
                    withContext(Dispatchers.IO) {
                        Anilist.userid = PrefManager.getNullableVal<String>(PrefName.AnilistUserId, null)
                            ?.toIntOrNull()
                        if (Anilist.userid == null) {
                            getUserId(requireContext()) {
                                load()
                            }
                        } else {
                            CoroutineScope(Dispatchers.IO).launch {
                                getUserId(requireContext()) {
                                    load()
                                }
                            }
                        }
                        model.loaded = true
                        model.loadTrending()
-                        model.loadTrendingNovel()
+                        model.loadAll()
                        model.loadPopular(
                            "MANGA", sort = Anilist.sortBy[1], onList = PrefManager.getVal(
                                PrefName.PopularMangaList
@ -246,6 +285,7 @@ class MangaFragment : Fragment() {
                    }
                    live.postValue(false)
                    _binding?.mangaRefresh?.isRefreshing = false
                    running = false
                }
            }
        }
--- a/app/src/main/java/ani/dantotsu/home/MangaPageAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/home/MangaPageAdapter.kt
@ -3,13 +3,14 @@ package ani.dantotsu.home
 import android.content.Intent
 import android.os.Handler
 import android.os.Looper
-import android.util.TypedValue
+import android.view.HapticFeedbackConstants
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.LayoutAnimationController
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.lifecycle.MutableLiveData
@ -19,11 +20,15 @@ import androidx.viewpager2.widget.ViewPager2
 import ani.dantotsu.MediaPageTransformer
 import ani.dantotsu.R
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.currContext
 import ani.dantotsu.databinding.ItemMangaPageBinding
 import ani.dantotsu.databinding.LayoutTrendingBinding
 import ani.dantotsu.getAppString
 import ani.dantotsu.getThemeColor
 import ani.dantotsu.loadImage
 import ani.dantotsu.media.GenreActivity
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaAdaptor
 import ani.dantotsu.media.MediaListViewActivity
 import ani.dantotsu.media.SearchActivity
 import ani.dantotsu.profile.ProfileActivity
 import ani.dantotsu.px
@ -40,6 +45,7 @@ import com.google.android.material.textfield.TextInputLayout
 class MangaPageAdapter : RecyclerView.Adapter<MangaPageAdapter.MangaPageViewHolder>() {
    val ready = MutableLiveData(false)
    lateinit var binding: ItemMangaPageBinding
    private lateinit var trendingBinding: LayoutTrendingBinding
    private var trendHandler: Handler? = null
    private lateinit var trendRun: Runnable
    var trendingViewPager: ViewPager2? = null
@ -52,33 +58,31 @@ class MangaPageAdapter : RecyclerView.Adapter<MangaPageAdapter.MangaPageViewHold
    override fun onBindViewHolder(holder: MangaPageViewHolder, position: Int) {
        binding = holder.binding
-        trendingViewPager = binding.mangaTrendingViewPager
+        trendingBinding = LayoutTrendingBinding.bind(binding.root)
        trendingViewPager = trendingBinding.trendingViewPager
-        val textInputLayout = holder.itemView.findViewById<TextInputLayout>(R.id.mangaSearchBar)
+        val textInputLayout = holder.itemView.findViewById<TextInputLayout>(R.id.searchBar)
        val currentColor = textInputLayout.boxBackgroundColor
        val semiTransparentColor = (currentColor and 0x00FFFFFF) or 0xA8000000.toInt()
        textInputLayout.boxBackgroundColor = semiTransparentColor
        val materialCardView =
-            holder.itemView.findViewById<MaterialCardView>(R.id.mangaUserAvatarContainer)
+            holder.itemView.findViewById<MaterialCardView>(R.id.userAvatarContainer)
        materialCardView.setCardBackgroundColor(semiTransparentColor)
-        val typedValue = TypedValue()
+        val color = binding.root.context.getThemeColor(android.R.attr.windowBackground)
-        currContext()?.theme?.resolveAttribute(android.R.attr.windowBackground, typedValue, true)
+        textInputLayout.boxBackgroundColor = (color and 0x00FFFFFF) or 0x28000000
-        val color = typedValue.data
+        materialCardView.setCardBackgroundColor((color and 0x00FFFFFF) or 0x28000000)
-        textInputLayout.boxBackgroundColor = (color and 0x00FFFFFF) or 0x28000000.toInt()
+        trendingBinding.titleContainer.updatePadding(top = statusBarHeight)
        materialCardView.setCardBackgroundColor((color and 0x00FFFFFF) or 0x28000000.toInt())
-        binding.mangaTitleContainer.updatePadding(top = statusBarHeight)
+        if (PrefManager.getVal(PrefName.SmallView)) trendingBinding.trendingContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {
        if (PrefManager.getVal(PrefName.SmallView)) binding.mangaTrendingContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {
            bottomMargin = (-108f).px
        }
        updateAvatar()
-        binding.mangaNotificationCount.visibility = if (Anilist.unreadNotificationCount > 0) View.VISIBLE else View.GONE
+        trendingBinding.notificationCount.isVisible = Anilist.unreadNotificationCount > 0
-        binding.mangaNotificationCount.text = Anilist.unreadNotificationCount.toString()
+        trendingBinding.notificationCount.text = Anilist.unreadNotificationCount.toString()
-        binding.mangaSearchBar.hint = "MANGA"
+        trendingBinding.searchBar.hint = "MANGA"
-        binding.mangaSearchBarText.setOnClickListener {
+        trendingBinding.searchBarText.setOnClickListener {
            ContextCompat.startActivity(
                it.context,
                Intent(it.context, SearchActivity::class.java).putExtra("type", "MANGA"),
@ -86,22 +90,23 @@ class MangaPageAdapter : RecyclerView.Adapter<MangaPageAdapter.MangaPageViewHold
            )
        }
-        binding.mangaUserAvatar.setSafeOnClickListener {
+        trendingBinding.userAvatar.setSafeOnClickListener {
            val dialogFragment =
                SettingsDialogFragment.newInstance(SettingsDialogFragment.Companion.PageType.MANGA)
            dialogFragment.show((it.context as AppCompatActivity).supportFragmentManager, "dialog")
        }
-        binding.mangaUserAvatar.setOnLongClickListener { view ->
+        trendingBinding.userAvatar.setOnLongClickListener { view ->
            view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
            ContextCompat.startActivity(
                view.context,
                Intent(view.context, ProfileActivity::class.java)
-                    .putExtra("userId", Anilist.userid),null
+                    .putExtra("userId", Anilist.userid), null
            )
            false
        }
-        binding.mangaSearchBar.setEndIconOnClickListener {
+        trendingBinding.searchBar.setEndIconOnClickListener {
-            binding.mangaSearchBarText.performClick()
+            trendingBinding.searchBarText.performClick()
        }
        binding.mangaGenreImage.loadImage("https://s4.anilist.co/file/anilistcdn/media/manga/banner/105778-wk5qQ7zAaTGl.jpg")
@ -125,8 +130,7 @@ class MangaPageAdapter : RecyclerView.Adapter<MangaPageAdapter.MangaPageViewHold
            )
        }
-        binding.mangaIncludeList.visibility =
+        binding.mangaIncludeList.isVisible = Anilist.userid != null
            if (Anilist.userid != null) View.VISIBLE else View.GONE
        binding.mangaIncludeList.isChecked = PrefManager.getVal(PrefName.PopularMangaList)
@ -148,63 +152,153 @@ class MangaPageAdapter : RecyclerView.Adapter<MangaPageAdapter.MangaPageViewHold
    }
    fun updateTrending(adaptor: MediaAdaptor) {
-        binding.mangaTrendingProgressBar.visibility = View.GONE
+        trendingBinding.trendingProgressBar.visibility = View.GONE
-        binding.mangaTrendingViewPager.adapter = adaptor
+        trendingBinding.trendingViewPager.adapter = adaptor
-        binding.mangaTrendingViewPager.offscreenPageLimit = 3
+        trendingBinding.trendingViewPager.offscreenPageLimit = 3
-        binding.mangaTrendingViewPager.getChildAt(0).overScrollMode = RecyclerView.OVER_SCROLL_NEVER
+        trendingBinding.trendingViewPager.getChildAt(0).overScrollMode =
-        binding.mangaTrendingViewPager.setPageTransformer(MediaPageTransformer())
+            RecyclerView.OVER_SCROLL_NEVER
        trendingBinding.trendingViewPager.setPageTransformer(MediaPageTransformer())
        trendHandler = Handler(Looper.getMainLooper())
        trendRun = Runnable {
-            binding.mangaTrendingViewPager.currentItem += 1
+            trendingBinding.trendingViewPager.currentItem += 1
        }
-        binding.mangaTrendingViewPager.registerOnPageChangeCallback(
+        trendingBinding.trendingViewPager.registerOnPageChangeCallback(
            object : ViewPager2.OnPageChangeCallback() {
                override fun onPageSelected(position: Int) {
                    super.onPageSelected(position)
-                    trendHandler!!.removeCallbacks(trendRun)
+                    trendHandler?.removeCallbacks(trendRun)
                    if (PrefManager.getVal(PrefName.TrendingScroller))
                        trendHandler!!.postDelayed(trendRun, 4000)
                }
            }
        )
-        binding.mangaTrendingViewPager.layoutAnimation =
+        trendingBinding.trendingViewPager.layoutAnimation =
            LayoutAnimationController(setSlideIn(), 0.25f)
-        binding.mangaTitleContainer.startAnimation(setSlideUp())
+        trendingBinding.titleContainer.startAnimation(setSlideUp())
        binding.mangaListContainer.layoutAnimation =
            LayoutAnimationController(setSlideIn(), 0.25f)
    }
-    fun updateNovel(adaptor: MediaAdaptor) {
+    fun updateTrendingManga(adaptor: MediaAdaptor, media: MutableList<Media>) {
-        binding.mangaNovelProgressBar.visibility = View.GONE
+        binding.apply {
-        binding.mangaNovelRecyclerView.adapter = adaptor
+            init(
-        binding.mangaNovelRecyclerView.layoutManager =
+                adaptor,
                mangaTrendingMangaRecyclerView,
                mangaTrendingMangaProgressBar,
                mangaTrendingManga,
                mangaTrendingMangaMore,
                getAppString(R.string.trending_manga),
                media
            )
        }
    }
    fun updateTrendingManhwa(adaptor: MediaAdaptor, media: MutableList<Media>) {
        binding.apply {
            init(
                adaptor,
                mangaTrendingManhwaRecyclerView,
                mangaTrendingManhwaProgressBar,
                mangaTrendingManhwa,
                mangaTrendingManhwaMore,
                getAppString(R.string.trending_manhwa),
                media
            )
        }
    }
    fun updateNovel(adaptor: MediaAdaptor, media: MutableList<Media>) {
        binding.apply {
            init(
                adaptor,
                mangaNovelRecyclerView,
                mangaNovelProgressBar,
                mangaNovel,
                mangaNovelMore,
                getAppString(R.string.trending_novel),
                media
            )
        }
    }
    fun updateTopRated(adaptor: MediaAdaptor, media: MutableList<Media>) {
        binding.apply {
            init(
                adaptor,
                mangaTopRatedRecyclerView,
                mangaTopRatedProgressBar,
                mangaTopRated,
                mangaTopRatedMore,
                getAppString(R.string.top_rated),
                media
            )
        }
    }
    fun updateMostFav(adaptor: MediaAdaptor, media: MutableList<Media>) {
        binding.apply {
            init(
                adaptor,
                mangaMostFavRecyclerView,
                mangaMostFavProgressBar,
                mangaMostFav,
                mangaMostFavMore,
                getAppString(R.string.most_favourite),
                media
            )
            mangaPopular.visibility = View.VISIBLE
            mangaPopular.startAnimation(setSlideUp())
        }
    }
    fun init(
        adaptor: MediaAdaptor,
        recyclerView: RecyclerView,
        progress: View,
        title: View ,
        more: View ,
        string: String,
        media : MutableList<Media>
    ) {
        progress.visibility = View.GONE
        recyclerView.adapter = adaptor
        recyclerView.layoutManager =
            LinearLayoutManager(
-                binding.mangaNovelRecyclerView.context,
+                recyclerView.context,
                LinearLayoutManager.HORIZONTAL,
                false
            )
-        binding.mangaNovelRecyclerView.visibility = View.VISIBLE
+        more.setOnClickListener {
-
+            MediaListViewActivity.passedMedia = media.toCollection(ArrayList())
-        binding.mangaNovel.visibility = View.VISIBLE
+            ContextCompat.startActivity(
-        binding.mangaNovel.startAnimation(setSlideUp())
+                it.context, Intent(it.context, MediaListViewActivity::class.java)
-        binding.mangaNovelRecyclerView.layoutAnimation =
+                    .putExtra("title", string),
                null
            )
        }
        recyclerView.visibility = View.VISIBLE
        title.visibility = View.VISIBLE
        more.visibility = View.VISIBLE
        title.startAnimation(setSlideUp())
        more.startAnimation(setSlideUp())
        recyclerView.layoutAnimation =
            LayoutAnimationController(setSlideIn(), 0.25f)
        binding.mangaPopular.visibility = View.VISIBLE
        binding.mangaPopular.startAnimation(setSlideUp())
    }
    fun updateAvatar() {
        if (Anilist.avatar != null && ready.value == true) {
-            binding.mangaUserAvatar.loadImage(Anilist.avatar)
+            trendingBinding.userAvatar.loadImage(Anilist.avatar)
-            binding.mangaUserAvatar.imageTintList = null
+            trendingBinding.userAvatar.imageTintList = null
        }
    }
    fun updateNotificationCount() {
        if (this::binding.isInitialized) {
-            binding.mangaNotificationCount.visibility =
+            trendingBinding.notificationCount.visibility =
                if (Anilist.unreadNotificationCount > 0) View.VISIBLE else View.GONE
-            binding.mangaNotificationCount.text = Anilist.unreadNotificationCount.toString()
+            trendingBinding.notificationCount.text = Anilist.unreadNotificationCount.toString()
        }
    }
--- a/app/src/main/java/ani/dantotsu/home/status/CircleView.kt
+++ b/app/src/main/java/ani/dantotsu/home/status/CircleView.kt
@ -0,0 +1,83 @@
 package ani.dantotsu.home.status
 import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Path
 import android.util.AttributeSet
 import android.view.View
 import ani.dantotsu.getThemeColor
 class CircleView(context: Context, attrs: AttributeSet?) : View(context, attrs) {
    private var parts: Int = 3
    private var gapAngle: Float = 12f
    private val path = Path()
    private var isUser = false
    private var booleanList = listOf<Boolean>()
    private val paint: Paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
        style = Paint.Style.STROKE
        strokeWidth = 6f
        strokeCap = Paint.Cap.ROUND
    }
    @SuppressLint("DrawAllocation")
    override fun onDraw(canvas: Canvas) {
        super.onDraw(canvas)
        val centerX = width / 2f
        val centerY = height / 2f
        val radius = centerX.coerceAtMost(centerY) - paint.strokeWidth / 2
        val totalGapAngle = gapAngle * (parts)
        val totalAngle = 360f - totalGapAngle
        val primaryColor = context.getThemeColor(com.google.android.material.R.attr.colorPrimary)
        val secondColor = context.getThemeColor(com.google.android.material.R.attr.colorOnPrimary)
        fun setColor(int: Int) {
            paint.color = if (int < booleanList.size && booleanList[int]) {
                 Color.GRAY
            } else {
                if (isUser) secondColor else primaryColor
            }
            canvas.drawPath(path, paint)
        }
        if (parts == 1) {
            path.addArc(
                centerX - radius,
                centerY - radius,
                centerX + radius,
                centerY + radius,
                0f,
                360f
            )
            setColor(0)
        } else {
            val effectiveAngle = totalAngle / parts
            for (i in 0 until parts) {
                val startAngle = i * (effectiveAngle + gapAngle) -90f
                path.reset()
                path.addArc(
                    centerX - radius,
                    centerY - radius,
                    centerX + radius,
                    centerY + radius,
                    startAngle,
                    effectiveAngle
                )
                setColor(i)
            }
        }
    }
    fun setParts(parts: Int, list : List<Boolean> = mutableListOf(), isUser: Boolean)  {
        this.parts = parts
        this.booleanList = list
        this.isUser = isUser
        invalidate()
    }
 }
--- a/app/src/main/java/ani/dantotsu/home/status/RepliesBottomDialog.kt
+++ b/app/src/main/java/ani/dantotsu/home/status/RepliesBottomDialog.kt
@ -0,0 +1,113 @@
 package ani.dantotsu.home.status
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import ani.dantotsu.BottomSheetDialogFragment
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.connections.anilist.api.ActivityReply
 import ani.dantotsu.databinding.BottomSheetRecyclerBinding
 import ani.dantotsu.profile.ProfileActivity
 import ani.dantotsu.profile.activity.ActivityReplyItem
 import ani.dantotsu.snackString
 import ani.dantotsu.util.MarkdownCreatorActivity
 import com.xwray.groupie.GroupieAdapter
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 class RepliesBottomDialog : BottomSheetDialogFragment() {
    private var _binding: BottomSheetRecyclerBinding? = null
    private val binding get() = _binding!!
    private val adapter: GroupieAdapter = GroupieAdapter()
    private val replies: MutableList<ActivityReply> = mutableListOf()
    private var activityId: Int = -1
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
    ): View? {
        _binding = BottomSheetRecyclerBinding.inflate(inflater, container, false)
        return _binding?.root
    }
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        binding.repliesRecyclerView.adapter = adapter
        binding.repliesRecyclerView.layoutManager = LinearLayoutManager(
            context,
            LinearLayoutManager.VERTICAL,
            false
        )
        val context = requireContext()
        binding.replyButton.setOnClickListener {
            ContextCompat.startActivity(
                context,
                Intent(context, MarkdownCreatorActivity::class.java)
                    .putExtra("type", "replyActivity")
                    .putExtra("parentId", activityId),
                null
            )
        }
        activityId = requireArguments().getInt("activityId")
        loading(true)
        lifecycleScope.launch(Dispatchers.IO) {
            val response = Anilist.query.getReplies(activityId)
            withContext(Dispatchers.Main) {
                loading(false)
                if (response != null) {
                    replies.clear()
                    replies.addAll(response.data.page.activityReplies)
                    adapter.update(
                        replies.map {
                            ActivityReplyItem(
                                it,
                                requireActivity(),
                                clickCallback = { int, _ ->
                                    onClick(int)
                                }
                            )
                        }
                    )
                } else {
                    snackString("Failed to load replies")
                }
            }
        }
    }
    private fun onClick(int: Int) {
        ContextCompat.startActivity(
            requireContext(),
            Intent(requireContext(), ProfileActivity::class.java).putExtra("userId", int),
            null
        )
    }
    private fun loading(load: Boolean) {
        binding.repliesRefresh.isVisible = load
        binding.repliesRecyclerView.isVisible = !load
    }
    override fun onDestroyView() {
        _binding = null
        super.onDestroyView()
    }
    companion object {
        fun newInstance(activityId: Int): RepliesBottomDialog {
            return RepliesBottomDialog().apply {
                arguments = Bundle().apply {
                    putInt("activityId", activityId)
                }
            }
        }
    }
 }
--- a/app/src/main/java/ani/dantotsu/home/status/StatusActivity.kt
+++ b/app/src/main/java/ani/dantotsu/home/status/StatusActivity.kt
@ -0,0 +1,110 @@
 package ani.dantotsu.home.status
 import android.os.Bundle
 import android.view.ViewGroup
 import android.view.animation.Animation
 import android.view.animation.AnimationUtils
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.updateLayoutParams
 import ani.dantotsu.R
 import ani.dantotsu.connections.anilist.api.Activity
 import ani.dantotsu.databinding.ActivityStatusBinding
 import ani.dantotsu.initActivity
 import ani.dantotsu.themes.ThemeManager
 import ani.dantotsu.home.status.listener.StoriesCallback
 import ani.dantotsu.navBarHeight
 import ani.dantotsu.profile.User
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.statusBarHeight
 class StatusActivity : AppCompatActivity(), StoriesCallback {
    private lateinit var activity: ArrayList<User>
    private lateinit var binding: ActivityStatusBinding
    private var position: Int = -1
    private lateinit var slideInLeft: Animation
    private lateinit var slideOutRight: Animation
    private lateinit var slideOutLeft: Animation
    private lateinit var slideInRight: Animation
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        ThemeManager(this).applyTheme()
        initActivity(this)
        binding = ActivityStatusBinding.inflate(layoutInflater)
        setContentView(binding.root)
        activity = user
        position = intent.getIntExtra("position", -1)
        binding.root.updateLayoutParams<ViewGroup.MarginLayoutParams> {
            topMargin = statusBarHeight
            bottomMargin = navBarHeight
        }
        slideInLeft = AnimationUtils.loadAnimation(this, R.anim.slide_in_left)
        slideOutRight = AnimationUtils.loadAnimation(this, R.anim.slide_out_right)
        slideOutLeft = AnimationUtils.loadAnimation(this, R.anim.slide_out_left)
        slideInRight = AnimationUtils.loadAnimation(this, R.anim.slide_in_right)
        val key = "activities"
        val watchedActivity = PrefManager.getCustomVal<Set<Int>>(key, setOf())
        val startFrom = findFirstNonMatch(watchedActivity, activity[position].activity )
        val startIndex = if ( startFrom > 0) startFrom else 0
        binding.stories.setStoriesList(activity[position].activity, this, startIndex + 1)
    }
    private fun findFirstNonMatch(watchedActivity: Set<Int>, activity: List<Activity>): Int {
        for (activityItem in activity) {
            if (activityItem.id !in watchedActivity) {
                return activity.indexOf(activityItem)
            }
        }
        return -1
    }
    override fun onPause() {
        super.onPause()
        binding.stories.pause()
    }
    override fun onResume() {
        super.onResume()
        binding.stories.resume()
    }
    override fun onWindowFocusChanged(hasFocus: Boolean) {
        super.onWindowFocusChanged(hasFocus)
        if (hasFocus) {
            binding.stories.resume()
        } else {
            binding.stories.pause()
        }
    }
    override fun onStoriesEnd() {
        position += 1
        if (position < activity.size) {
            val key = "activities"
            val watchedActivity = PrefManager.getCustomVal<Set<Int>>(key, setOf())
            val startFrom = findFirstNonMatch(watchedActivity, activity[position].activity )
            val startIndex= if ( startFrom > 0) startFrom else 0
            binding.stories.startAnimation(slideOutLeft)
            binding.stories.setStoriesList(activity[position].activity, this, startIndex + 1)
            binding.stories.startAnimation(slideInRight)
        } else {
            finish()
        }
    }
    override fun onStoriesStart() {
        position -= 1
        if (position >= 0) {
            val key = "activities"
            val watchedActivity = PrefManager.getCustomVal<Set<Int>>(key, setOf())
            val startFrom = findFirstNonMatch(watchedActivity, activity[position].activity )
            val startIndex = if ( startFrom > 0) startFrom else 0
            binding.stories.startAnimation(slideOutRight)
            binding.stories.setStoriesList(activity[position].activity, this, startIndex + 1)
            binding.stories.startAnimation(slideInLeft)
        } else {
            finish()
        }
    }
    companion object {
        var user: ArrayList<User> = arrayListOf()
    }
 }
--- a/app/src/main/java/ani/dantotsu/home/status/Stories.kt
+++ b/app/src/main/java/ani/dantotsu/home/status/Stories.kt
@ -0,0 +1,505 @@
 package ani.dantotsu.home.status
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
 import android.widget.ProgressBar
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.app.ActivityOptionsCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
 import ani.dantotsu.R
 import ani.dantotsu.blurImage
 import ani.dantotsu.buildMarkwon
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.connections.anilist.api.Activity
 import ani.dantotsu.databinding.FragmentStatusBinding
 import ani.dantotsu.getThemeColor
 import ani.dantotsu.home.status.listener.StoriesCallback
 import ani.dantotsu.loadImage
 import ani.dantotsu.media.MediaDetailsActivity
 import ani.dantotsu.profile.ProfileActivity
 import ani.dantotsu.profile.User
 import ani.dantotsu.profile.UsersDialogFragment
 import ani.dantotsu.profile.activity.ActivityItemBuilder
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.snackString
 import ani.dantotsu.util.AniMarkdown
 import ani.dantotsu.util.Logger
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.util.Calendar
 import java.util.Locale
 import kotlin.math.abs
 class Stories @JvmOverloads constructor(
    context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr), View.OnTouchListener {
    private lateinit var activity: FragmentActivity
    private lateinit var binding: FragmentStatusBinding
    private lateinit var activityList: List<Activity>
    private lateinit var storiesListener: StoriesCallback
    private var userClicked: Boolean = false
    private var storyIndex: Int = 1
    private var primaryColor: Int = 0
    private var onPrimaryColor: Int = 0
    private var storyDuration: Int = 6
    private val timer: StoryTimer = StoryTimer(secondsToMillis(storyDuration))
    init {
        initLayout()
    }
    @SuppressLint("ClickableViewAccessibility")
    fun initLayout() {
        val inflater: LayoutInflater = LayoutInflater.from(context)
        binding = FragmentStatusBinding.inflate(inflater, this, false)
        addView(binding.root)
        primaryColor = context.getThemeColor(com.google.android.material.R.attr.colorPrimary)
        onPrimaryColor = context.getThemeColor(com.google.android.material.R.attr.colorOnPrimary)
        if (context is StoriesCallback) storiesListener = context as StoriesCallback
        binding.leftTouchPanel.setOnTouchListener(this)
        binding.rightTouchPanel.setOnTouchListener(this)
    }
    fun setStoriesList(
        activityList: List<Activity>, activity: FragmentActivity, startIndex: Int = 1
    ) {
        this.activityList = activityList
        this.activity = activity
        this.storyIndex = startIndex
        addLoadingViews(activityList)
    }
    private fun addLoadingViews(storiesList: List<Activity>) {
        var idCounter = 1
        for (story in storiesList) {
            binding.progressBarContainer.removeView(findViewWithTag<ProgressBar>("story${idCounter}"))
            val progressBar = ProgressBar(context, null, android.R.attr.progressBarStyleHorizontal)
            progressBar.visibility = View.VISIBLE
            progressBar.id = idCounter
            progressBar.tag = "story${idCounter++}"
            progressBar.progressBackgroundTintList = ColorStateList.valueOf(primaryColor)
            progressBar.progressTintList = ColorStateList.valueOf(onPrimaryColor)
            val params = LayoutParams(0, LayoutParams.WRAP_CONTENT)
            params.marginEnd = 5
            params.marginStart = 5
            binding.progressBarContainer.addView(progressBar, params)
        }
        val constraintSet = ConstraintSet()
        constraintSet.clone(binding.progressBarContainer)
        var counter = storiesList.size
        for (story in storiesList) {
            val progressBar = findViewWithTag<ProgressBar>("story${counter}")
            if (progressBar != null) {
                if (storiesList.size > 1) {
                    when (counter) {
                        storiesList.size -> {
                            constraintSet.connect(
                                getId("story${counter}"),
                                ConstraintSet.END,
                                LayoutParams.PARENT_ID,
                                ConstraintSet.END
                            )
                            constraintSet.connect(
                                getId("story${counter}"),
                                ConstraintSet.TOP,
                                LayoutParams.PARENT_ID,
                                ConstraintSet.TOP
                            )
                            constraintSet.connect(
                                getId("story${counter}"),
                                ConstraintSet.START,
                                getId("story${counter - 1}"),
                                ConstraintSet.END
                            )
                        }
                        1 -> {
                            constraintSet.connect(
                                getId("story${counter}"),
                                ConstraintSet.TOP,
                                LayoutParams.PARENT_ID,
                                ConstraintSet.TOP
                            )
                            constraintSet.connect(
                                getId("story${counter}"),
                                ConstraintSet.START,
                                LayoutParams.PARENT_ID,
                                ConstraintSet.START
                            )
                            constraintSet.connect(
                                getId("story${counter}"),
                                ConstraintSet.END,
                                getId("story${counter + 1}"),
                                ConstraintSet.START
                            )
                        }
                        else -> {
                            constraintSet.connect(
                                getId("story${counter}"),
                                ConstraintSet.TOP,
                                LayoutParams.PARENT_ID,
                                ConstraintSet.TOP
                            )
                            constraintSet.connect(
                                getId("story${counter}"),
                                ConstraintSet.START,
                                getId("story${counter - 1}"),
                                ConstraintSet.END
                            )
                            constraintSet.connect(
                                getId("story${counter}"),
                                ConstraintSet.END,
                                getId("story${counter + 1}"),
                                ConstraintSet.START
                            )
                        }
                    }
                } else {
                    constraintSet.connect(
                        getId("story${counter}"),
                        ConstraintSet.END,
                        LayoutParams.PARENT_ID,
                        ConstraintSet.END
                    )
                    constraintSet.connect(
                        getId("story${counter}"),
                        ConstraintSet.TOP,
                        LayoutParams.PARENT_ID,
                        ConstraintSet.TOP
                    )
                    constraintSet.connect(
                        getId("story${counter}"),
                        ConstraintSet.START,
                        LayoutParams.PARENT_ID,
                        ConstraintSet.START
                    )
                }
            }
            counter--
        }
        constraintSet.applyTo(binding.progressBarContainer)
        startShowContent()
    }
    private fun startShowContent() {
        showStory()
    }
    private fun showStory() {
        if (storyIndex > 1) {
            completeProgressBar(storyIndex - 1)
        }
        val progressBar = findViewWithTag<ProgressBar>("story${storyIndex}")
        binding.androidStoriesLoadingView.visibility = View.VISIBLE
        timer.setOnTimerCompletedListener {
            Logger.log("onAnimationEnd: $storyIndex")
            if (storyIndex - 1 <= activityList.size) {
                Logger.log("userNotClicked: $storyIndex")
                if (storyIndex < activityList.size) {
                    storyIndex += 1
                    showStory()
                } else {
                    // on stories end
                    binding.androidStoriesLoadingView.visibility = View.GONE
                    onStoriesCompleted()
                }
            } else {
                // on stories end
                binding.androidStoriesLoadingView.visibility = View.GONE
                onStoriesCompleted()
            }
        }
        timer.setOnPercentTickListener {
            progressBar.progress = it
        }
        loadStory(activityList[storyIndex - 1])
    }
    private fun getId(tag: String): Int {
        return findViewWithTag<ProgressBar>(tag).id
    }
    private fun secondsToMillis(seconds: Int): Long {
        return (seconds.toLong()).times(1000)
    }
    private fun resetProgressBar(storyIndex: Int) {
        for (i in storyIndex until activityList.size + 1) {
            val progressBar = findViewWithTag<ProgressBar>("story${i}")
            progressBar?.let {
                it.progress = 0
            }
        }
    }
    private fun completeProgressBar(storyIndex: Int) {
        for (i in 1 until storyIndex + 1) {
            val progressBar = findViewWithTag<ProgressBar>("story${i}")
            progressBar?.let {
                it.progress = 100
            }
        }
    }
    private var startClickTime = 0L
    private var startX = 0f
    private var startY = 0f
    private var isLongPress = false
    private val swipeThreshold = 100
    override fun onTouch(view: View?, event: MotionEvent?): Boolean {
        val maxClickDuration = 200
        when (event?.action) {
            MotionEvent.ACTION_DOWN -> {
                startX = event.x
                startY = event.y
                startClickTime = Calendar.getInstance().timeInMillis
                pause()
                isLongPress = false
            }
            MotionEvent.ACTION_MOVE -> {
                val deltaX = event.x - startX
                val deltaY = event.y - startY
                if (!isLongPress && (abs(deltaX) > swipeThreshold || abs(deltaY) > swipeThreshold)) {
                    isLongPress = true
                }
            }
            MotionEvent.ACTION_UP -> {
                val clickDuration = Calendar.getInstance().timeInMillis - startClickTime
                if (clickDuration < maxClickDuration && !isLongPress) {
                    when (view?.id) {
                        R.id.leftTouchPanel -> leftPanelTouch()
                        R.id.rightTouchPanel -> rightPanelTouch()
                    }
                } else {
                    resume()
                }
                val deltaX = event.x - startX
                if (abs(deltaX) > swipeThreshold) {
                    if (deltaX > 0) onStoriesPrevious()
                    else onStoriesCompleted()
                }
            }
        }
        return true
    }
    private fun rightPanelTouch() {
        Logger.log("rightPanelTouch: $storyIndex")
        if (storyIndex == activityList.size) {
            completeProgressBar(storyIndex)
            onStoriesCompleted()
            return
        }
        userClicked = true
        timer.cancel()
        if (storyIndex <= activityList.size) storyIndex += 1
        showStory()
    }
    private fun leftPanelTouch() {
        Logger.log("leftPanelTouch: $storyIndex")
        if (storyIndex == 1) {
            onStoriesPrevious()
            return
        }
        userClicked = true
        timer.cancel()
        resetProgressBar(storyIndex)
        if (storyIndex > 1) storyIndex -= 1
        showStory()
    }
    private fun onStoriesCompleted() {
        Logger.log("onStoriesCompleted")
        if (::storiesListener.isInitialized) {
            storyIndex = 1
            storiesListener.onStoriesEnd()
            resetProgressBar(storyIndex)
        }
    }
    private fun onStoriesPrevious() {
        if (::storiesListener.isInitialized) {
            storyIndex = 1
            storiesListener.onStoriesStart()
            resetProgressBar(storyIndex)
        }
    }
    fun pause() {
        timer.pause()
    }
    fun resume() {
        timer.resume()
    }
    private fun loadStory(story: Activity) {
        val key = "activities"
        val set = PrefManager.getCustomVal<Set<Int>>(key, setOf()).plus((story.id))
        val newList = set.sorted().takeLast(200).toSet()
        PrefManager.setCustomVal(key, newList)
        binding.statusUserAvatar.loadImage(story.user?.avatar?.large)
        binding.statusUserName.text = story.user?.name
        binding.statusUserTime.text = ActivityItemBuilder.getDateTime(story.createdAt)
        binding.statusUserContainer.setOnClickListener {
            ContextCompat.startActivity(
                context,
                Intent(context, ProfileActivity::class.java).putExtra("userId", story.userId),
                null
            )
        }
        fun visible(isList: Boolean) {
            binding.textActivity.isVisible = !isList
            binding.textActivityContainer.isVisible = !isList
            binding.infoText.isVisible = isList
            binding.coverImage.isVisible = isList
            binding.infoText.visibility = if (isList) View.VISIBLE else View.INVISIBLE
            binding.infoText.text = ""
            binding.contentImageViewKen.isVisible = isList
            binding.contentImageView.isVisible = isList
        }
        when (story.typename) {
            "ListActivity" -> {
                visible(true)
                val text = "${
                    story.status?.replaceFirstChar {
                        if (it.isLowerCase()) {
                            it.titlecase(Locale.ROOT)
                        } else {
                            it.toString()
                        }
                    }
                } ${story.progress ?: story.media?.title?.userPreferred} " +
                    if (
                        story.status?.contains("completed") == false &&
                        !story.status.contains("plans") &&
                        !story.status.contains("repeating")
                    ) {
                        "of ${story.media?.title?.userPreferred}"
                    } else {
                        ""
                    }
                binding.infoText.text = text
                val bannerAnimations: Boolean = PrefManager.getVal(PrefName.BannerAnimations)
                blurImage(
                    if (bannerAnimations) binding.contentImageViewKen else binding.contentImageView,
                    story.media?.bannerImage ?: story.media?.coverImage?.extraLarge
                )
                binding.coverImage.loadImage(story.media?.coverImage?.extraLarge)
                binding.coverImage.setOnClickListener {
                    ContextCompat.startActivity(
                        context,
                        Intent(context, MediaDetailsActivity::class.java).putExtra(
                            "mediaId",
                            story.media?.id
                        ),
                        ActivityOptionsCompat.makeSceneTransitionAnimation(
                            activity,
                            binding.coverImage,
                            ViewCompat.getTransitionName(binding.coverImage)!!
                        ).toBundle()
                    )
                }
            }
            "TextActivity" -> {
                visible(false)
                if (!(context as android.app.Activity).isDestroyed) {
                    val markwon = buildMarkwon(context, false)
                    markwon.setMarkdown(
                        binding.textActivity, AniMarkdown.getBasicAniHTML(story.text ?: "")
                    )
                }
            }
            "MessageActivity" -> {
                visible(false)
                if (!(context as android.app.Activity).isDestroyed) {
                    val markwon = buildMarkwon(context, false)
                    markwon.setMarkdown(
                        binding.textActivity, AniMarkdown.getBasicAniHTML(story.message ?: "")
                    )
                }
            }
        }
        val userList = arrayListOf<User>()
        story.likes?.forEach { i ->
            userList.add(User(i.id, i.name.toString(), i.avatar?.medium, i.bannerImage))
        }
        val likeColor = ContextCompat.getColor(context, R.color.yt_red)
        val notLikeColor = ContextCompat.getColor(context, R.color.bg_opp)
        binding.activityRepliesContainer.setOnClickListener {
            RepliesBottomDialog.newInstance(story.id)
                .show(activity.supportFragmentManager, "replies")
        }
        binding.activityLike.setColorFilter(if (story.isLiked == true) likeColor else notLikeColor)
        binding.replyCount.text = story.replyCount.toString()
        binding.activityLikeCount.text = story.likeCount.toString()
        binding.activityReplies.setColorFilter(ContextCompat.getColor(context, R.color.bg_opp))
        binding.activityLikeContainer.setOnClickListener {
            like()
        }
        binding.activityLikeContainer.setOnLongClickListener {
            val context = activity
            UsersDialogFragment().apply {
                userList(userList)
                show(context.supportFragmentManager, "dialog")
            }
            true
        }
        binding.androidStoriesLoadingView.visibility = View.GONE
        timer.start()
    }
    fun like() {
        val story = activityList[storyIndex - 1]
        val likeColor = ContextCompat.getColor(context, R.color.yt_red)
        val notLikeColor = ContextCompat.getColor(context, R.color.bg_opp)
        val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
        scope.launch {
            val res = Anilist.query.toggleLike(story.id, "ACTIVITY")
            withContext(Dispatchers.Main) {
                if (res != null) {
                    if (story.isLiked == true) {
                        story.likeCount = story.likeCount?.minus(1)
                    } else {
                        story.likeCount = story.likeCount?.plus(1)
                    }
                    binding.activityLikeCount.text = (story.likeCount ?: 0).toString()
                    story.isLiked = !story.isLiked!!
                    binding.activityLike.setColorFilter(if (story.isLiked == true) likeColor else notLikeColor)
                } else {
                    snackString("Failed to like activity")
                }
            }
        }
    }
 }
--- a/app/src/main/java/ani/dantotsu/home/status/StoryTimer.kt
+++ b/app/src/main/java/ani/dantotsu/home/status/StoryTimer.kt
@ -0,0 +1,64 @@
 package ani.dantotsu.home.status
 import android.os.CountDownTimer
 class StoryTimer(
    private val updateInterval: Long
 ) {
    private lateinit var timer: CountDownTimer
    private var prevVal = 0
    private var pauseLength = 0L
    var onTimerCompleted: () -> Unit = {}
    var percentTick: (Int) -> Unit = {}
    var timeLeft: Long = 0
        private set
    fun start(durationInMillis: Long = updateInterval) {
        cancel()
        timer = object : CountDownTimer(durationInMillis, 1) {
            override fun onTick(millisUntilFinished: Long) {
                timeLeft = millisUntilFinished
                val percent =
                    ((pauseLength + durationInMillis - millisUntilFinished) * 100 / (pauseLength + durationInMillis)).toInt()
                if (percent != prevVal) {
                    percentTick.invoke(percent)
                    prevVal = percent
                }
            }
            override fun onFinish() {
                onTimerCompleted.invoke()
                pauseLength = 0
            }
        }
        timer.start()
    }
    fun cancel() {
        if (::timer.isInitialized) {
            timer.cancel()
        }
    }
    fun pause() {
        if (::timer.isInitialized) {
            timer.cancel()
            pauseLength = updateInterval - timeLeft
        }
    }
    fun resume() {
        if (::timer.isInitialized && timeLeft > 0) {
            start(timeLeft)
            timer.start()
        }
    }
    fun setOnTimerCompletedListener(onTimerCompleted: () -> Unit) {
        this.onTimerCompleted = onTimerCompleted
    }
    fun setOnPercentTickListener(percentTick: (Int) -> Unit) {
        this.percentTick = percentTick
    }
 }
--- a/app/src/main/java/ani/dantotsu/home/status/UserStatusAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/home/status/UserStatusAdapter.kt
@ -0,0 +1,73 @@
 package ani.dantotsu.home.status
 import android.content.Context
 import android.content.Intent
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import ani.dantotsu.R
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.databinding.ItemUserStatusBinding
 import ani.dantotsu.getAppString
 import ani.dantotsu.loadImage
 import ani.dantotsu.profile.ProfileActivity
 import ani.dantotsu.profile.User
 import ani.dantotsu.setAnimation
 import ani.dantotsu.settings.saving.PrefManager
 class UserStatusAdapter(private val user: ArrayList<User>) :
    RecyclerView.Adapter<UserStatusAdapter.UsersViewHolder>() {
    inner class UsersViewHolder(val binding: ItemUserStatusBinding) :
        RecyclerView.ViewHolder(binding.root) {
        init {
            itemView.setOnClickListener {
                StatusActivity.user = user
                ContextCompat.startActivity(
                    itemView.context,
                    Intent(
                        itemView.context,
                        StatusActivity::class.java
                    ).putExtra("position", bindingAdapterPosition),
                    null
                )
            }
            itemView.setOnLongClickListener {
                ContextCompat.startActivity(
                    itemView.context,
                    Intent(
                        itemView.context,
                        ProfileActivity::class.java
                    ).putExtra("userId", user[bindingAdapterPosition].id),
                    null
                )
                true
            }
        }
    }
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): UsersViewHolder {
        return UsersViewHolder(
            ItemUserStatusBinding.inflate(
                LayoutInflater.from(parent.context),
                parent,
                false
            )
        )
    }
    override fun onBindViewHolder(holder: UsersViewHolder, position: Int) {
        val b = holder.binding
        setAnimation(b.root.context, b.root)
        val user = user[position]
        b.profileUserAvatar.loadImage(user.pfp)
        b.profileUserName.text = if (Anilist.userid == user.id) getAppString(R.string.your_story) else user.name
        val watchedActivity = PrefManager.getCustomVal<Set<Int>>("activities", setOf())
        val booleanList = user.activity.map { watchedActivity.contains(it.id) }
        b.profileUserStatusIndicator.setParts(user.activity.size, booleanList, user.id == Anilist.userid)
    }
    override fun getItemCount(): Int = user.size
 }
--- a/app/src/main/java/ani/dantotsu/home/status/listener/StoriesCallback.kt
+++ b/app/src/main/java/ani/dantotsu/home/status/listener/StoriesCallback.kt
@ -0,0 +1,6 @@
 package ani.dantotsu.home.status.listener
 interface StoriesCallback {
    fun onStoriesEnd()
    fun onStoriesStart()
 }
--- a/app/src/main/java/ani/dantotsu/media/Author.kt
+++ b/app/src/main/java/ani/dantotsu/media/Author.kt
@ -3,9 +3,10 @@ package ani.dantotsu.media
 import java.io.Serializable
 data class Author(
-    val id: Int,
+    var id: Int,
-    val name: String?,
+    var name: String?,
-    val image: String?,
+    var image: String?,
-    val role: String?,
+    var role: String?,
-    var yearMedia: MutableMap<String, ArrayList<Media>>? = null
+    var yearMedia: MutableMap<String, ArrayList<Media>>? = null,
    var character: ArrayList<Character>? = null
 ) : Serializable
--- a/app/src/main/java/ani/dantotsu/media/AuthorActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/AuthorActivity.kt
@ -12,6 +12,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import ani.dantotsu.EmptyAdapter
 import ani.dantotsu.R
 import ani.dantotsu.Refresh
@ -32,7 +33,6 @@ class AuthorActivity : AppCompatActivity() {
    private val model: OtherDetailsViewModel by viewModels()
    private var author: Author? = null
    private var loaded = false
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@ -55,14 +55,15 @@ class AuthorActivity : AppCompatActivity() {
        binding.studioClose.setOnClickListener {
            onBackPressedDispatcher.onBackPressed()
        }
        model.getAuthor().observe(this) {
            if (it != null) {
                author = it
                loaded = true
                binding.studioProgressBar.visibility = View.GONE
                binding.studioRecycler.visibility = View.VISIBLE
-
+                if (author!!.yearMedia.isNullOrEmpty()) {
                    binding.studioRecycler.visibility = View.GONE
                }
                val titlePosition = arrayListOf<Int>()
                val concatAdapter = ConcatAdapter()
                val map = author!!.yearMedia ?: return@observe
@ -89,9 +90,19 @@ class AuthorActivity : AppCompatActivity() {
                    concatAdapter.addAdapter(MediaAdaptor(0, medias, this, true))
                    concatAdapter.addAdapter(EmptyAdapter(empty))
                }
                binding.studioRecycler.adapter = concatAdapter
                binding.studioRecycler.layoutManager = gridLayoutManager
                binding.charactersRecycler.visibility = View.VISIBLE
                binding.charactersText.visibility = View.VISIBLE
                binding.charactersRecycler.adapter =
                    CharacterAdapter(author!!.character ?: arrayListOf())
                binding.charactersRecycler.layoutManager =
                    LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)
                if (author!!.character.isNullOrEmpty()) {
                    binding.charactersRecycler.visibility = View.GONE
                    binding.charactersText.visibility = View.GONE
                }
            }
        }
        val live = Refresh.activity.getOrPut(this.hashCode()) { MutableLiveData(true) }
--- a/app/src/main/java/ani/dantotsu/media/AuthorAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/media/AuthorAdapter.kt
@ -1,6 +1,5 @@
 package ani.dantotsu.media
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.view.LayoutInflater
@ -16,7 +15,7 @@ import ani.dantotsu.setAnimation
 import java.io.Serializable
 class AuthorAdapter(
-    private val authorList: ArrayList<Author>
+    private val authorList: ArrayList<Author>,
 ) : RecyclerView.Adapter<AuthorAdapter.AuthorViewHolder>() {
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AuthorViewHolder {
        val binding =
@ -24,8 +23,7 @@ class AuthorAdapter(
        return AuthorViewHolder(binding)
    }
-    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: AuthorViewHolder, position: Int) {
    override fun onBindViewHolder(holder:AuthorViewHolder, position: Int) {
        val binding = holder.binding
        setAnimation(binding.root.context, holder.binding.root)
        val author = authorList[position]
--- a/app/src/main/java/ani/dantotsu/media/CalendarActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/CalendarActivity.kt
@ -1,12 +1,9 @@
 package ani.dantotsu.media
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.util.TypedValue
 import android.view.View
 import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowManager
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
@ -16,8 +13,9 @@ import androidx.lifecycle.lifecycleScope
 import ani.dantotsu.R
 import ani.dantotsu.Refresh
 import ani.dantotsu.databinding.ActivityListBinding
 import ani.dantotsu.getThemeColor
 import ani.dantotsu.hideSystemBarsExtendView
 import ani.dantotsu.media.user.ListViewPagerAdapter
 import ani.dantotsu.navBarHeight
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.statusBarHeight
@ -34,7 +32,6 @@ class CalendarActivity : AppCompatActivity() {
    private var selectedTabIdx = 1
    private val model: OtherDetailsViewModel by viewModels()
    @SuppressLint("SetTextI18n")
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@ -42,22 +39,10 @@ class CalendarActivity : AppCompatActivity() {
        binding = ActivityListBinding.inflate(layoutInflater)
-        val typedValue = TypedValue()
+
-        theme.resolveAttribute(com.google.android.material.R.attr.colorSurface, typedValue, true)
+        val primaryColor = getThemeColor(com.google.android.material.R.attr.colorSurface)
-        val primaryColor = typedValue.data
+        val primaryTextColor = getThemeColor(com.google.android.material.R.attr.colorPrimary)
-        val typedValue2 = TypedValue()
+        val secondaryTextColor = getThemeColor(com.google.android.material.R.attr.colorOutline)
        theme.resolveAttribute(
            com.google.android.material.R.attr.colorOnBackground,
            typedValue2,
            true
        )
        val titleTextColor = typedValue2.data
        val typedValue3 = TypedValue()
        theme.resolveAttribute(com.google.android.material.R.attr.colorPrimary, typedValue3, true)
        val primaryTextColor = typedValue3.data
        val typedValue4 = TypedValue()
        theme.resolveAttribute(com.google.android.material.R.attr.colorOutline, typedValue4, true)
        val secondaryTextColor = typedValue4.data
        window.statusBarColor = primaryColor
        window.navigationBarColor = primaryColor
@ -74,10 +59,7 @@ class CalendarActivity : AppCompatActivity() {
        } else {
            binding.root.fitsSystemWindows = false
            requestWindowFeature(Window.FEATURE_NO_TITLE)
-            window.setFlags(
+            hideSystemBarsExtendView()
                WindowManager.LayoutParams.FLAG_FULLSCREEN,
                WindowManager.LayoutParams.FLAG_FULLSCREEN
            )
            binding.settingsContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                topMargin = statusBarHeight
            }
@ -87,6 +69,7 @@ class CalendarActivity : AppCompatActivity() {
        binding.listTitle.setText(R.string.release_calendar)
        binding.listSort.visibility = View.GONE
        binding.random.visibility = View.GONE
        binding.search.visibility = View.GONE
        binding.listTabLayout.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
            override fun onTabSelected(tab: TabLayout.Tab?) {
                this@CalendarActivity.selectedTabIdx = tab?.position ?: 1
--- a/app/src/main/java/ani/dantotsu/media/Character.kt
+++ b/app/src/main/java/ani/dantotsu/media/Character.kt
@ -14,5 +14,6 @@ data class Character(
    var age: String? = null,
    var gender: String? = null,
    var dateOfBirth: FuzzyDate? = null,
-    var roles: ArrayList<Media>? = null
+    var roles: ArrayList<Media>? = null,
    val voiceActor: ArrayList<Author>? = null,
 ) : Serializable
--- a/app/src/main/java/ani/dantotsu/media/CharacterAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/media/CharacterAdapter.kt
@ -1,6 +1,5 @@
 package ani.dantotsu.media
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.view.LayoutInflater
@ -24,12 +23,13 @@ class CharacterAdapter(
        return CharacterViewHolder(binding)
    }
    @SuppressLint("SetTextI18n")
    override fun onBindViewHolder(holder: CharacterViewHolder, position: Int) {
        val binding = holder.binding
        setAnimation(binding.root.context, holder.binding.root)
        val character = characterList[position]
-        binding.itemCompactRelation.text = character.role + "  "
+        val whitespace = "${character.role}  "
        character.voiceActor
        binding.itemCompactRelation.text = whitespace
        binding.itemCompactImage.loadImage(character.image)
        binding.itemCompactTitle.text = character.name
    }
--- a/app/src/main/java/ani/dantotsu/media/CharacterDetailsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/CharacterDetailsActivity.kt
@ -8,6 +8,7 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.math.MathUtils.clamp
 import androidx.core.view.isGone
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.lifecycle.MutableLiveData
@ -94,7 +95,8 @@ class CharacterDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChang
        }
        lifecycleScope.launch {
            withContext(Dispatchers.IO) {
-                character.isFav = Anilist.query.isUserFav(AnilistMutations.FavType.CHARACTER, character.id)
+                character.isFav =
                    Anilist.query.isUserFav(AnilistMutations.FavType.CHARACTER, character.id)
            }
            withContext(Dispatchers.Main) {
                binding.characterFav.setImageResource(
@ -152,7 +154,7 @@ class CharacterDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChang
    }
    override fun onResume() {
-        binding.characterProgress.visibility = if (!loaded) View.VISIBLE else View.GONE
+        binding.characterProgress.isGone = loaded
        super.onResume()
    }
--- a/app/src/main/java/ani/dantotsu/media/CharacterDetailsAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/media/CharacterDetailsAdapter.kt
@ -1,9 +1,10 @@
 package ani.dantotsu.media
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import ani.dantotsu.R
 import ani.dantotsu.currActivity
@ -20,15 +21,22 @@ class CharacterDetailsAdapter(private val character: Character, private val acti
        return GenreViewHolder(binding)
    }
    @SuppressLint("SetTextI18n")
    override fun onBindViewHolder(holder: GenreViewHolder, position: Int) {
        val binding = holder.binding
        val desc =
-            (if (character.age != "null") currActivity()!!.getString(R.string.age) + " " + character.age else "") +
+            (if (character.age != "null") "${currActivity()!!.getString(R.string.age)} ${character.age}" else "") +
-                    (if (character.dateOfBirth.toString() != "") currActivity()!!.getString(R.string.birthday) + " " + character.dateOfBirth.toString() else "") +
+                    (if (character.dateOfBirth.toString() != "")
-                    (if (character.gender != "null") currActivity()!!.getString(R.string.gender) + " " + when (character.gender) {
+                        "${currActivity()!!.getString(R.string.birthday)} ${character.dateOfBirth.toString()}" else "") +
-                        "Male" -> currActivity()!!.getString(R.string.male)
+                    (if (character.gender != "null")
-                        "Female" -> currActivity()!!.getString(R.string.female)
+                        currActivity()!!.getString(R.string.gender) + " " + when (character.gender) {
                            currActivity()!!.getString(R.string.male) -> currActivity()!!.getString(
                                R.string.male
                            )
                            currActivity()!!.getString(R.string.female) -> currActivity()!!.getString(
                                R.string.female
                            )
                            else -> character.gender
                        } else "") + "\n" + character.description
@ -36,7 +44,13 @@ class CharacterDetailsAdapter(private val character: Character, private val acti
        val markWon = Markwon.builder(activity).usePlugin(SoftBreakAddsNewLinePlugin.create())
            .usePlugin(SpoilerPlugin()).build()
        markWon.setMarkdown(binding.characterDesc, desc.replace("~!", "||").replace("!~", "||"))
-
+        binding.voiceActorRecycler.adapter = AuthorAdapter(character.voiceActor ?: arrayListOf())
        binding.voiceActorRecycler.layoutManager = LinearLayoutManager(
            activity, LinearLayoutManager.HORIZONTAL, false
        )
        if (binding.voiceActorRecycler.adapter!!.itemCount == 0) {
            binding.voiceActorContainer.visibility = View.GONE
        }
    }
    override fun getItemCount(): Int = 1
--- a/app/src/main/java/ani/dantotsu/media/Media.kt
+++ b/app/src/main/java/ani/dantotsu/media/Media.kt
@ -5,8 +5,10 @@ import ani.dantotsu.connections.anilist.api.FuzzyDate
 import ani.dantotsu.connections.anilist.api.MediaEdge
 import ani.dantotsu.connections.anilist.api.MediaList
 import ani.dantotsu.connections.anilist.api.MediaType
 import ani.dantotsu.connections.anilist.api.Query
 import ani.dantotsu.media.anime.Anime
 import ani.dantotsu.media.manga.Manga
 import ani.dantotsu.profile.User
 import java.io.Serializable
 import ani.dantotsu.connections.anilist.api.Media as ApiMedia
@ -25,7 +27,7 @@ data class Media(
    var cover: String? = null,
    var banner: String? = null,
    var relation: String? = null,
-    var popularity: Int? = null,
+    var favourites: Int? = null,
    var isAdult: Boolean,
    var isFav: Boolean = false,
@ -56,14 +58,18 @@ data class Media(
    var trailer: String? = null,
    var startDate: FuzzyDate? = null,
    var endDate: FuzzyDate? = null,
    var popularity: Int? = null,
    var timeUntilAiring: Long? = null,
    var characters: ArrayList<Character>? = null,
    var review: ArrayList<Query.Review>? = null,
    var staff: ArrayList<Author>? = null,
    var prequel: Media? = null,
    var sequel: Media? = null,
    var relations: ArrayList<Media>? = null,
    var recommendations: ArrayList<Media>? = null,
-
+    var users: ArrayList<User>? = null,
    var vrvId: String? = null,
    var crunchySlug: String? = null,
@ -83,7 +89,7 @@ data class Media(
        name = apiMedia.title!!.english,
        nameRomaji = apiMedia.title!!.romaji,
        userPreferredName = apiMedia.title!!.userPreferred,
-        cover = apiMedia.coverImage?.large,
+        cover = apiMedia.coverImage?.large ?: apiMedia.coverImage?.medium,
        banner = apiMedia.bannerImage,
        status = apiMedia.status.toString(),
        isFav = apiMedia.isFavourite!!,
@ -95,6 +101,8 @@ data class Media(
        meanScore = apiMedia.meanScore,
        startDate = apiMedia.startDate,
        endDate = apiMedia.endDate,
        favourites = apiMedia.favourites,
        timeUntilAiring = apiMedia.nextAiringEpisode?.timeUntilAiring?.let { it.toLong() * 1000 },
        anime = if (apiMedia.type == MediaType.ANIME) Anime(
            totalEpisodes = apiMedia.episodes,
            nextAiringEpisode = apiMedia.nextAiringEpisode?.episode?.minus(1)
@ -109,7 +117,8 @@ data class Media(
        this.userScore = mediaList.score?.toInt() ?: 0
        this.userStatus = mediaList.status?.toString()
        this.userUpdatedAt = mediaList.updatedAt?.toLong()
-        this.genres = mediaList.media?.genres?.toMutableList() as? ArrayList<String>? ?: arrayListOf()
+        this.genres =
            mediaList.media?.genres?.toMutableList() as? ArrayList<String>? ?: arrayListOf()
    }
    constructor(mediaEdge: MediaEdge) : this(mediaEdge.node!!) {
--- a/app/src/main/java/ani/dantotsu/media/MediaAdaptor.kt
+++ b/app/src/main/java/ani/dantotsu/media/MediaAdaptor.kt
@ -1,8 +1,6 @@
 package ani.dantotsu.media
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Canvas
@ -15,25 +13,25 @@ import android.widget.ImageView
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.app.ActivityOptionsCompat
 import androidx.core.content.ContextCompat
 import androidx.core.util.Pair
 import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
-import ani.dantotsu.*
+import ani.dantotsu.R
 import ani.dantotsu.blurImage
 import ani.dantotsu.currActivity
 import ani.dantotsu.databinding.ItemMediaCompactBinding
 import ani.dantotsu.databinding.ItemMediaLargeBinding
 import ani.dantotsu.databinding.ItemMediaPageBinding
 import ani.dantotsu.databinding.ItemMediaPageSmallBinding
 import ani.dantotsu.loadImage
 import ani.dantotsu.setAnimation
 import ani.dantotsu.setSafeOnClickListener
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.model.GlideUrl
 import com.bumptech.glide.request.RequestOptions
 import com.flaviofaria.kenburnsview.RandomTransitionGenerator
 import jp.wasabeef.glide.transformations.BlurTransformation
 import java.io.Serializable
@ -85,7 +83,7 @@ class MediaAdaptor(
    }
-    @SuppressLint("SetTextI18n", "ClickableViewAccessibility")
+    @SuppressLint("ClickableViewAccessibility")
    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
        when (type) {
            0 -> {
@ -94,8 +92,8 @@ class MediaAdaptor(
                val media = mediaList?.getOrNull(position)
                if (media != null) {
                    b.itemCompactImage.loadImage(media.cover)
-                    b.itemCompactOngoing.visibility =
+                    b.itemCompactOngoing.isVisible =
-                        if (media.status == currActivity()!!.getString(R.string.status_releasing)) View.VISIBLE else View.GONE
+                        media.status == currActivity()!!.getString(R.string.status_releasing)
                    b.itemCompactTitle.text = media.userPreferredName
                    b.itemCompactScore.text =
                        ((if (media.userScore == 0) (media.meanScore
@ -140,8 +138,8 @@ class MediaAdaptor(
                if (media != null) {
                    b.itemCompactImage.loadImage(media.cover)
                    blurImage(b.itemCompactBanner, media.banner ?: media.cover)
-                    b.itemCompactOngoing.visibility =
+                    b.itemCompactOngoing.isVisible =
-                        if (media.status == currActivity()!!.getString(R.string.status_releasing)) View.VISIBLE else View.GONE
+                        media.status == currActivity()!!.getString(R.string.status_releasing)
                    b.itemCompactTitle.text = media.userPreferredName
                    b.itemCompactScore.text =
                        ((if (media.userScore == 0) (media.meanScore
@ -151,25 +149,30 @@ class MediaAdaptor(
                        (if (media.userScore != 0) R.drawable.item_user_score else R.drawable.item_score)
                    )
                    if (media.anime != null) {
-                        b.itemTotal.text = " " + if ((media.anime.totalEpisodes
+                        val itemTotal = " " + if ((media.anime.totalEpisodes
                                ?: 0) != 1
-                        ) currActivity()!!.getString(R.string.episode_plural)
+                        ) currActivity()!!.getString(R.string.episode_plural) else currActivity()!!.getString(
-                        else currActivity()!!.getString(R.string.episode_singular)
+                            R.string.episode_singular
                        )
                        b.itemTotal.text = itemTotal
                        b.itemCompactTotal.text =
                            if (media.anime.nextAiringEpisode != null) (media.anime.nextAiringEpisode.toString() + " / " + (media.anime.totalEpisodes
                                ?: "??").toString()) else (media.anime.totalEpisodes
                                ?: "??").toString()
                    } else if (media.manga != null) {
-                        b.itemTotal.text = " " + if ((media.manga.totalChapters
+                        val itemTotal = " " + if ((media.manga.totalChapters
                                ?: 0) != 1
-                        ) currActivity()!!.getString(R.string.chapter_plural)
+                        ) currActivity()!!.getString(R.string.chapter_plural) else currActivity()!!.getString(
-                        else currActivity()!!.getString(R.string.chapter_singular)
+                            R.string.chapter_singular
                        )
                        b.itemTotal.text = itemTotal
                        b.itemCompactTotal.text = "${media.manga.totalChapters ?: "??"}"
                    }
                    @SuppressLint("NotifyDataSetChanged")
                    if (position == mediaList!!.size - 2 && viewPager != null) viewPager.post {
                        val start = mediaList.size
                        mediaList.addAll(mediaList)
-                        notifyDataSetChanged()
+                        val end = mediaList.size - start
                        notifyItemRangeInserted(start, end)
                    }
                }
            }
@ -178,6 +181,7 @@ class MediaAdaptor(
                val b = (holder as MediaPageViewHolder).binding
                val media = mediaList?.get(position)
                if (media != null) {
                    val bannerAnimations: Boolean = PrefManager.getVal(PrefName.BannerAnimations)
                    b.itemCompactImage.loadImage(media.cover)
                    if (bannerAnimations)
@ -187,9 +191,12 @@ class MediaAdaptor(
                                AccelerateDecelerateInterpolator()
                            )
                        )
-                    blurImage(b.itemCompactBanner, media.banner ?: media.cover)
+                    blurImage(
-                    b.itemCompactOngoing.visibility =
+                        if (bannerAnimations) b.itemCompactBanner else b.itemCompactBannerNoKen,
-                        if (media.status == currActivity()!!.getString(R.string.status_releasing)) View.VISIBLE else View.GONE
+                        media.banner ?: media.cover
                    )
                    b.itemCompactOngoing.isVisible =
                        media.status == currActivity()!!.getString(R.string.status_releasing)
                    b.itemCompactTitle.text = media.userPreferredName
                    b.itemCompactScore.text =
                        ((if (media.userScore == 0) (media.meanScore
@ -236,9 +243,12 @@ class MediaAdaptor(
                                AccelerateDecelerateInterpolator()
                            )
                        )
-                    blurImage(b.itemCompactBanner, media.banner ?: media.cover)
+                    blurImage(
-                    b.itemCompactOngoing.visibility =
+                        if (bannerAnimations) b.itemCompactBanner else b.itemCompactBannerNoKen,
-                        if (media.status == currActivity()!!.getString(R.string.status_releasing)) View.VISIBLE else View.GONE
+                        media.banner ?: media.cover
                    )
                    b.itemCompactOngoing.isVisible =
                        media.status == currActivity()!!.getString(R.string.status_releasing)
                    b.itemCompactTitle.text = media.userPreferredName
                    b.itemCompactScore.text =
                        ((if (media.userScore == 0) (media.meanScore
--- a/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt
@ -2,28 +2,27 @@ package ani.dantotsu.media
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
-import android.graphics.Rect
+import android.content.res.Configuration
 import android.os.Bundle
 import android.text.SpannableStringBuilder
 import android.util.TypedValue
 import android.view.GestureDetector
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.widget.FrameLayout
 import android.widget.ImageView
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import androidx.core.text.bold
 import androidx.core.text.color
 import androidx.core.view.isVisible
 import androidx.core.view.marginBottom
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updateMargins
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
@ -38,6 +37,7 @@ import ani.dantotsu.blurImage
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.copyToClipboard
 import ani.dantotsu.databinding.ActivityMediaBinding
 import ani.dantotsu.getThemeColor
 import ani.dantotsu.initActivity
 import ani.dantotsu.loadImage
 import ani.dantotsu.media.anime.AnimeWatchFragment
@ -54,6 +54,7 @@ import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.snackString
 import ani.dantotsu.statusBarHeight
 import ani.dantotsu.themes.ThemeManager
 import ani.dantotsu.util.LauncherWrapper
 import com.flaviofaria.kenburnsview.RandomTransitionGenerator
 import com.google.android.material.appbar.AppBarLayout
 import kotlinx.coroutines.CoroutineScope
@ -62,20 +63,21 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import nl.joery.animatedbottombar.AnimatedBottomBar
 import kotlin.math.abs
 class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedListener {
-
+    lateinit var launcher: LauncherWrapper
    lateinit var binding: ActivityMediaBinding
    private val scope = lifecycleScope
    private val model: MediaDetailsViewModel by viewModels()
    lateinit var tabLayout: TripleNavAdapter
    var selected = 0
    lateinit var navBar: AnimatedBottomBar
    var anime = true
    private var adult = false
-    @SuppressLint("SetTextI18n", "ClickableViewAccessibility")
+    @SuppressLint("ClickableViewAccessibility")
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        var media: Media = intent.getSerialized("media") ?: mediaSingleton ?: emptyMedia()
@ -83,8 +85,7 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
        if (id != -1) {
            runBlocking {
                withContext(Dispatchers.IO) {
-                    media =
+                    media = Anilist.query.getMedia(id, false) ?: emptyMedia()
                        Anilist.query.getMedia(id, false) ?: emptyMedia()
                }
            }
        }
@ -93,6 +94,9 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
            onBackPressedDispatcher.onBackPressed()
            return
        }
        val contract = ActivityResultContracts.OpenDocumentTree()
        launcher = LauncherWrapper(this, contract)
        mediaSingleton = null
        ThemeManager(this).applyTheme(MediaSingleton.bitmap)
        MediaSingleton.bitmap = null
@ -100,26 +104,38 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
        binding = ActivityMediaBinding.inflate(layoutInflater)
        setContentView(binding.root)
        screenWidth = resources.displayMetrics.widthPixels.toFloat()
        navBar = binding.mediaBottomBar
-        val isVertical = resources.configuration.orientation
+        // Ui init
        //Ui init
        initActivity(this)
-        binding.mediaViewPager.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin += navBarHeight }
+        binding.mediaViewPager.updateLayoutParams<ViewGroup.MarginLayoutParams> {
            bottomMargin = navBarHeight
        }
        val oldMargin = binding.mediaViewPager.marginBottom
        AndroidBug5497Workaround.assistActivity(this) {
            if (it) {
                binding.mediaViewPager.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                    bottomMargin = 0
                }
-                binding.mediaTabContainer.visibility = View.GONE
+                navBar.visibility = View.GONE
            } else {
                binding.mediaViewPager.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                    bottomMargin = oldMargin
                }
-                binding.mediaTabContainer.visibility = View.VISIBLE
+                navBar.visibility = View.VISIBLE
            }
        }
        val navBarRightMargin = if (resources.configuration.orientation ==
            Configuration.ORIENTATION_LANDSCAPE
        ) navBarHeight else 0
        val navBarBottomMargin = if (resources.configuration.orientation ==
            Configuration.ORIENTATION_LANDSCAPE
        ) 0 else navBarHeight
        navBar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
            rightMargin = navBarRightMargin
            bottomMargin = navBarBottomMargin
        }
        binding.mediaBanner.updateLayoutParams { height += statusBarHeight }
        binding.mediaBannerNoKen.updateLayoutParams { height += statusBarHeight }
        binding.mediaClose.updateLayoutParams<ViewGroup.MarginLayoutParams> { topMargin += statusBarHeight }
@ -147,7 +163,6 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
        val banner =
            if (bannerAnimations) binding.mediaBanner else binding.mediaBannerNoKen
        val viewPager = binding.mediaViewPager
        //tabLayout = binding.mediaTab as AnimatedBottomBar
        viewPager.isUserInputEnabled = false
        viewPager.setPageTransformer(ZoomOutPageTransformer())
@ -157,9 +172,10 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
        binding.mediaCoverImage.loadImage(media.cover)
        binding.mediaCoverImage.setOnLongClickListener {
            val coverTitle = getString(R.string.cover, media.userPreferredName)
            ImageViewDialog.newInstance(
                this,
-                media.userPreferredName + "[Cover]",
+                coverTitle,
                media.cover
            )
        }
@ -176,9 +192,10 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
            }
            override fun onLongClick(event: MotionEvent) {
                val bannerTitle = getString(R.string.banner, media.userPreferredName)
                ImageViewDialog.newInstance(
                    this@MediaDetailsActivity,
-                    media.userPreferredName + "[Banner]",
+                    bannerTitle,
                    media.banner ?: media.cover
                )
                banner.performClick()
@ -186,7 +203,8 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
        })
        banner.setOnTouchListener { _, motionEvent -> gestureDetector.onTouchEvent(motionEvent);true }
        if (PrefManager.getVal(PrefName.Incognito)) {
-            binding.mediaTitle.text = "    ${media.userPreferredName}"
+            val mediaTitle = "    ${media.userPreferredName}"
            binding.mediaTitle.text = mediaTitle
            binding.incognito.visibility = View.VISIBLE
        } else {
            binding.mediaTitle.text = media.userPreferredName
@ -210,20 +228,6 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
                    R.drawable.ic_round_favorite_24
                )
            )
            val typedValue = TypedValue()
            this.theme.resolveAttribute(
                com.google.android.material.R.attr.colorSecondary,
                typedValue,
                true
            )
            val color = typedValue.data
            val typedValue2 = TypedValue()
            this.theme.resolveAttribute(
                com.google.android.material.R.attr.colorSecondary,
                typedValue2,
                true
            )
            val color2 = typedValue.data
            PopImageButton(
                scope,
@ -231,7 +235,7 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
                R.drawable.ic_round_favorite_24,
                R.drawable.ic_round_favorite_border_24,
                R.color.bg_opp,
-                R.color.violet_400,//TODO: Change to colorSecondary
+                R.color.violet_400,
                media.isFav
            ) {
                media.isFav = it
@ -246,22 +250,12 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
        @SuppressLint("ResourceType")
        fun total() {
            val text = SpannableStringBuilder().apply {
-                val typedValue = TypedValue()
+
-                this@MediaDetailsActivity.theme.resolveAttribute(
+                val white = this@MediaDetailsActivity.getThemeColor(com.google.android.material.R.attr.colorOnBackground)
                    com.google.android.material.R.attr.colorOnBackground,
                    typedValue,
                    true
                )
                val white = typedValue.data
                if (media.userStatus != null) {
                    append(if (media.anime != null) getString(R.string.watched_num) else getString(R.string.read_num))
-                    val typedValue = TypedValue()
+                    val colorSecondary = getThemeColor(com.google.android.material.R.attr.colorSecondary)
-                    theme.resolveAttribute(
+                    bold { color(colorSecondary) { append("${media.userProgress}") } }
                        com.google.android.material.R.attr.colorSecondary,
                        typedValue,
                        true
                    )
                    bold { color(typedValue.data) { append("${media.userProgress}") } }
                    append(
                        if (media.anime != null) getString(R.string.episodes_out_of) else getString(
                            R.string.chapters_out_of
@ -342,18 +336,16 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
                progress()
            }
        }
        tabLayout = TripleNavAdapter(
            binding.mediaTab1,
            binding.mediaTab2,
            binding.mediaTab3,
            media.anime != null,
            media.format ?: "",
            isVertical == 1
        )
        adult = media.isAdult
        if (media.anime != null) {
            viewPager.adapter =
-                ViewPagerAdapter(supportFragmentManager, lifecycle, SupportedMedia.ANIME, media, intent.getIntExtra("commentId", -1))
+                ViewPagerAdapter(
                    supportFragmentManager,
                    lifecycle,
                    SupportedMedia.ANIME,
                    media,
                    intent.getIntExtra("commentId", -1)
                )
        } else if (media.manga != null) {
            viewPager.adapter = ViewPagerAdapter(
                supportFragmentManager,
@ -365,31 +357,47 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
            anime = false
        }
        selected = media.selected!!.window
        binding.mediaTitle.translationX = -screenWidth
-        tabLayout.selectionListener = { selected, newId ->
+        val infoTab = navBar.createTab(R.drawable.ic_round_info_24, R.string.info, R.id.info)
-            binding.commentInputLayout.visibility = if (selected == 2) View.VISIBLE else View.GONE
+        val watchTab = if (anime) {
-            this.selected = selected
+            navBar.createTab(R.drawable.ic_round_movie_filter_24, R.string.watch, R.id.watch)
-            selectFromID(newId)
+        } else if (media.format == "NOVEL") {
-            viewPager.setCurrentItem(selected, false)
+            navBar.createTab(R.drawable.ic_round_book_24, R.string.read, R.id.read)
-            val sel = model.loadSelected(media, isDownload)
+        } else {
-            sel.window = selected
+            navBar.createTab(R.drawable.ic_round_import_contacts_24, R.string.read, R.id.read)
            model.saveSelected(media.id, sel)
        }
-        tabLayout.selectTab(selected)
+        val commentTab =
-        selectFromID(tabLayout.selected)
+            navBar.createTab(R.drawable.ic_round_comment_24, R.string.comments, R.id.comment)
-        viewPager.setCurrentItem(selected, false)
+        navBar.addTab(infoTab)
-
+        navBar.addTab(watchTab)
        navBar.addTab(commentTab)
        if (model.continueMedia == null && media.cameFromContinue) {
            model.continueMedia = PrefManager.getVal(PrefName.ContinueMedia)
            selected = 1
        }
-        val frag = intent.getStringExtra("FRAGMENT_TO_LOAD")
+        if (intent.getStringExtra("FRAGMENT_TO_LOAD") != null) selected = 2
-        if (frag != null) {
+        if (viewPager.currentItem != selected) viewPager.post {
-            selected = 2
+            viewPager.setCurrentItem(selected, false)
        }
        binding.commentInputLayout.isVisible = selected == 2
        navBar.selectTabAt(selected)
        navBar.setOnTabSelectListener(object : AnimatedBottomBar.OnTabSelectListener {
            override fun onTabSelected(
                lastIndex: Int,
                lastTab: AnimatedBottomBar.Tab?,
                newIndex: Int,
                newTab: AnimatedBottomBar.Tab
            ) {
                selected = newIndex
                binding.commentInputLayout.isVisible = selected == 2
                viewPager.setCurrentItem(selected, true)
                val sel = model.loadSelected(media, isDownload)
                sel.window = selected
                model.saveSelected(media.id, sel)
            }
        })
        val live = Refresh.activity.getOrPut(this.hashCode()) { MutableLiveData(true) }
        live.observe(this) {
@ -402,40 +410,21 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
        }
    }
-    private fun selectFromID(id: Int) {
+    override fun onConfigurationChanged(newConfig: Configuration) {
-        when (id) {
+        super.onConfigurationChanged(newConfig)
-            R.id.info -> {
+        val rightMargin = if (resources.configuration.orientation ==
-                selected = 0
+            Configuration.ORIENTATION_LANDSCAPE
-            }
+        ) navBarHeight else 0
-
+        val bottomMargin = if (resources.configuration.orientation ==
-            R.id.watch, R.id.read -> {
+            Configuration.ORIENTATION_LANDSCAPE
-                selected = 1
+        ) 0 else navBarHeight
-            }
+        val params: ViewGroup.MarginLayoutParams =
-
+            navBar.layoutParams as ViewGroup.MarginLayoutParams
-            R.id.comment -> {
+        params.updateMargins(right = rightMargin, bottom = bottomMargin)
                selected = 2
            }
        }
    }
    private fun idFromSelect(): Int {
        if (anime) when (selected) {
            0 -> return R.id.info
            1 -> return R.id.watch
            2 -> return R.id.comment
        }
        else when (selected) {
            0 -> return R.id.info
            1 -> return R.id.read
            2 -> return R.id.comment
        }
        return R.id.info
    }
    override fun onResume() {
-        if (this::tabLayout.isInitialized) {
+        navBar.selectTabAt(selected)
            tabLayout.selectTab(selected)
        }
        super.onResume()
    }
@ -443,7 +432,7 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
        ANIME, MANGA, NOVEL
    }
-    //ViewPager
+    // ViewPager
    private class ViewPagerAdapter(
        fragmentManager: FragmentManager,
        lifecycle: Lifecycle,
@ -462,6 +451,7 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
                SupportedMedia.MANGA -> MangaReadFragment()
                SupportedMedia.NOVEL -> NovelReadFragment()
            }
            2 -> {
                val fragment = CommentsFragment()
                val bundle = Bundle()
@ -489,13 +479,6 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
        binding.mediaCover.visibility =
            if (binding.mediaCover.scaleX == 0f) View.GONE else View.VISIBLE
        val duration = (200 * (PrefManager.getVal(PrefName.AnimationSpeed) as Float)).toLong()
        val typedValue = TypedValue()
        this@MediaDetailsActivity.theme.resolveAttribute(
            com.google.android.material.R.attr.colorSecondary,
            typedValue,
            true
        )
        val color = typedValue.data
        if (percentage >= percent && !isCollapsed) {
            isCollapsed = true
            ObjectAnimator.ofFloat(binding.mediaTitle, "translationX", 0f).setDuration(duration)
--- a/app/src/main/java/ani/dantotsu/media/MediaDetailsViewModel.kt
+++ b/app/src/main/java/ani/dantotsu/media/MediaDetailsViewModel.kt
@ -9,7 +9,6 @@ import androidx.lifecycle.ViewModel
 import ani.dantotsu.R
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.currContext
 import ani.dantotsu.util.Logger
 import ani.dantotsu.media.anime.Episode
 import ani.dantotsu.media.anime.SelectorDialogFragment
 import ani.dantotsu.media.manga.MangaChapter
@ -29,6 +28,7 @@ import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.snackString
 import ani.dantotsu.tryWithSuspend
 import ani.dantotsu.util.Logger
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
@ -52,26 +52,23 @@ class MediaDetailsViewModel : ViewModel() {
                    it
                }
        if (isDownload) {
-            data.sourceIndex = if (media.anime != null) {
+            data.sourceIndex = when {
                media.anime != null -> {
                    AnimeSources.list.size - 1
-            } else if (media.format == "MANGA" || media.format == "ONE_SHOT") {
+                }
                media.format == "MANGA" || media.format == "ONE_SHOT" -> {
                    MangaSources.list.size - 1
-            } else {
+                }
                else -> {
                    NovelSources.list.size - 1
                }
            }
        }
        return data
    }
    fun loadSelectedStringLocation(sourceName: String): Int {
        //find the location of the source in the list
        var location = watchSources?.list?.indexOfFirst { it.name == sourceName } ?: 0
        if (location == -1) {
            location = 0
        }
        return location
    }
    var continueMedia: Boolean? = null
    private var loading = false
@ -152,10 +149,10 @@ class MediaDetailsViewModel : ViewModel() {
            watchSources?.get(i)?.apply {
                if (!post && !allowsPreloading) return@apply
                ep.sEpisode?.let {
-                    loadByVideoServers(link, ep.extra, it) {
+                    loadByVideoServers(link, ep.extra, it) { extractor ->
-                        if (it.videos.isNotEmpty()) {
+                        if (extractor.videos.isNotEmpty()) {
-                            list.add(it)
+                            list.add(extractor)
-                            ep.extractorCallback?.invoke(it)
+                            ep.extractorCallback?.invoke(extractor)
                        }
                    }
                }
@ -291,7 +288,6 @@ class MediaDetailsViewModel : ViewModel() {
    suspend fun loadMangaChapterImages(
        chapter: MangaChapter,
        selected: Selected,
        series: String,
        post: Boolean = true
    ): Boolean {
--- a/app/src/main/java/ani/dantotsu/media/MediaInfoFragment.kt
+++ b/app/src/main/java/ani/dantotsu/media/MediaInfoFragment.kt
@ -3,7 +3,6 @@ package ani.dantotsu.media
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.CountDownTimer
@ -16,18 +15,37 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.core.text.HtmlCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
-import ani.dantotsu.*
+import ani.dantotsu.R
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.connections.anilist.GenresViewModel
-import ani.dantotsu.databinding.*
+import ani.dantotsu.copyToClipboard
 import ani.dantotsu.currActivity
 import ani.dantotsu.databinding.ActivityGenreBinding
 import ani.dantotsu.databinding.FragmentMediaInfoBinding
 import ani.dantotsu.databinding.ItemChipBinding
 import ani.dantotsu.databinding.ItemQuelsBinding
 import ani.dantotsu.databinding.ItemTitleChipgroupBinding
 import ani.dantotsu.databinding.ItemTitleRecyclerBinding
 import ani.dantotsu.databinding.ItemTitleTextBinding
 import ani.dantotsu.databinding.ItemTitleTrailerBinding
 import ani.dantotsu.displayTimer
 import ani.dantotsu.isOnline
 import ani.dantotsu.loadImage
 import ani.dantotsu.navBarHeight
 import ani.dantotsu.profile.User
 import ani.dantotsu.px
 import ani.dantotsu.setSafeOnClickListener
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import com.xwray.groupie.GroupieAdapter
 import io.noties.markwon.Markwon
 import io.noties.markwon.SoftBreakAddsNewLinePlugin
 import kotlinx.coroutines.Dispatchers
@ -37,7 +55,6 @@ import java.io.Serializable
 import java.net.URLEncoder
@SuppressLint("SetTextI18n")
 class MediaInfoFragment : Fragment() {
    private var _binding: FragmentMediaInfoBinding? = null
    private val binding get() = _binding!!
@ -46,6 +63,8 @@ class MediaInfoFragment : Fragment() {
    private var type = "ANIME"
    private val genreModel: GenresViewModel by activityViewModels()
    private val tripleTab = "\t\t\t"
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
@ -62,9 +81,10 @@ class MediaInfoFragment : Fragment() {
    @SuppressLint("SetJavaScriptEnabled")
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        val model: MediaDetailsViewModel by activityViewModels()
-        val offline: Boolean = PrefManager.getVal(PrefName.OfflineMode)
+        val offline: Boolean =
-        binding.mediaInfoProgressBar.visibility = if (!loaded) View.VISIBLE else View.GONE
+            PrefManager.getVal(PrefName.OfflineMode) || !isOnline(requireContext())
-        binding.mediaInfoContainer.visibility = if (loaded) View.VISIBLE else View.GONE
+        binding.mediaInfoProgressBar.isGone = loaded
        binding.mediaInfoContainer.isVisible = loaded
        binding.mediaInfoContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin += 128f.px + navBarHeight }
        model.scrolledToTop.observe(viewLifecycleOwner) {
@ -75,17 +95,18 @@ class MediaInfoFragment : Fragment() {
            if (media != null && !loaded) {
                loaded = true
                binding.mediaInfoProgressBar.visibility = View.GONE
                binding.mediaInfoContainer.visibility = View.VISIBLE
-                binding.mediaInfoName.text = "\t\t\t" + (media.name ?: media.nameRomaji)
+                val infoName = tripleTab + (media.name ?: media.nameRomaji)
                binding.mediaInfoName.text = infoName
                binding.mediaInfoName.setOnLongClickListener {
                    copyToClipboard(media.name ?: media.nameRomaji)
                    true
                }
                if (media.name != null) binding.mediaInfoNameRomajiContainer.visibility =
                    View.VISIBLE
-                binding.mediaInfoNameRomaji.text = "\t\t\t" + media.nameRomaji
+                val infoNameRomanji = tripleTab + media.nameRomaji
                binding.mediaInfoNameRomaji.text = infoNameRomanji
                binding.mediaInfoNameRomaji.setOnLongClickListener {
                    copyToClipboard(media.nameRomaji)
                    true
@ -97,6 +118,8 @@ class MediaInfoFragment : Fragment() {
                binding.mediaInfoSource.text = media.source
                binding.mediaInfoStart.text = media.startDate?.toString() ?: "??"
                binding.mediaInfoEnd.text = media.endDate?.toString() ?: "??"
                binding.mediaInfoPopularity.text = media.popularity.toString()
                binding.mediaInfoFavorites.text = media.favourites.toString()
                if (media.anime != null) {
                    val episodeDuration = media.anime.episodeDuration
@ -125,8 +148,10 @@ class MediaInfoFragment : Fragment() {
                    }
                    binding.mediaInfoDurationContainer.visibility = View.VISIBLE
                    binding.mediaInfoSeasonContainer.visibility = View.VISIBLE
-                    binding.mediaInfoSeason.text =
+                    val seasonInfo =
-                        (media.anime.season ?: "??") + " " + (media.anime.seasonYear ?: "??")
+                        "${(media.anime.season ?: "??")} ${(media.anime.seasonYear ?: "??")}"
                    binding.mediaInfoSeason.text = seasonInfo
                    if (media.anime.mainStudio != null) {
                        binding.mediaInfoStudioContainer.visibility = View.VISIBLE
                        binding.mediaInfoStudio.text = media.anime.mainStudio!!.name
@ -160,9 +185,12 @@ class MediaInfoFragment : Fragment() {
                        }
                    }
                    binding.mediaInfoTotalTitle.setText(R.string.total_eps)
-                    binding.mediaInfoTotal.text =
+                    val infoTotal = if (media.anime.nextAiringEpisode != null)
-                        if (media.anime.nextAiringEpisode != null) (media.anime.nextAiringEpisode.toString() + " | " + (media.anime.totalEpisodes
+                        "${media.anime.nextAiringEpisode} | ${media.anime.totalEpisodes ?: "~"}"
-                            ?: "~").toString()) else (media.anime.totalEpisodes ?: "~").toString()
+                    else
                        (media.anime.totalEpisodes ?: "~").toString()
                    binding.mediaInfoTotal.text = infoTotal
                } else if (media.manga != null) {
                    type = "MANGA"
                    binding.mediaInfoTotalTitle.setText(R.string.total_chaps)
@ -189,8 +217,10 @@ class MediaInfoFragment : Fragment() {
                    (media.description ?: "null").replace("\\n", "<br>").replace("\\\"", "\""),
                    HtmlCompat.FROM_HTML_MODE_LEGACY
                )
-                binding.mediaInfoDescription.text =
+                val infoDesc =
-                    "\t\t\t" + if (desc.toString() != "null") desc else getString(R.string.no_description_available)
+                    tripleTab + if (desc.toString() != "null") desc else getString(R.string.no_description_available)
                binding.mediaInfoDescription.text = infoDesc
                binding.mediaInfoDescription.setOnClickListener {
                    if (binding.mediaInfoDescription.maxLines == 5) {
                        ObjectAnimator.ofInt(binding.mediaInfoDescription, "maxLines", 100)
@ -200,8 +230,7 @@ class MediaInfoFragment : Fragment() {
                            .setDuration(400).start()
                    }
                }
-
+                displayTimer(media, binding.mediaInfoContainer)
                countDown(media, binding.mediaInfoContainer)
                val parent = _binding?.mediaInfoContainer!!
                val screenWidth = resources.displayMetrics.run { widthPixels / density }
@ -223,7 +252,41 @@ class MediaInfoFragment : Fragment() {
                    }
                    parent.addView(bind.root)
                }
-
+                if (!media.users.isNullOrEmpty() && !offline) {
                    val users: ArrayList<User> = media.users ?: arrayListOf()
                    if (Anilist.token != null && media.userStatus != null) {
                        users.add(
                            0,
                            User(
                                id = Anilist.userid!!,
                                name = getString(R.string.you),
                                pfp = Anilist.avatar,
                                banner = "",
                                status = media.userStatus,
                                score = media.userScore.toFloat(),
                                progress = media.userProgress,
                                totalEpisodes = media.anime?.totalEpisodes
                                    ?: media.manga?.totalChapters,
                                nextAiringEpisode = media.anime?.nextAiringEpisode
                            )
                        )
                    }
                    ItemTitleRecyclerBinding.inflate(
                        LayoutInflater.from(context),
                        parent,
                        false
                    ).apply {
                        itemTitle.visibility = View.GONE
                        itemRecycler.adapter =
                            MediaSocialAdapter(users, type, requireActivity())
                        itemRecycler.layoutManager = LinearLayoutManager(
                            requireContext(),
                            LinearLayoutManager.HORIZONTAL,
                            false
                        )
                        parent.addView(root)
                    }
                }
                if (media.trailer != null && !offline) {
                    @Suppress("DEPRECATION")
                    class MyChrome : WebChromeClient() {
@ -413,18 +476,18 @@ class MediaInfoFragment : Fragment() {
                if (!media.relations.isNullOrEmpty() && !offline) {
                    if (media.sequel != null || media.prequel != null) {
-                        val bind = ItemQuelsBinding.inflate(
+                        ItemQuelsBinding.inflate(
                            LayoutInflater.from(context),
                            parent,
                            false
-                        )
+                        ).apply {
                            if (media.sequel != null) {
-                            bind.mediaInfoSequel.visibility = View.VISIBLE
+                                mediaInfoSequel.visibility = View.VISIBLE
-                            bind.mediaInfoSequelImage.loadImage(
+                                mediaInfoSequelImage.loadImage(
                                    media.sequel!!.banner ?: media.sequel!!.cover
                                )
-                            bind.mediaInfoSequel.setSafeOnClickListener {
+                                mediaInfoSequel.setSafeOnClickListener {
                                    ContextCompat.startActivity(
                                        requireContext(),
                                        Intent(
@ -438,11 +501,11 @@ class MediaInfoFragment : Fragment() {
                                }
                            }
                            if (media.prequel != null) {
-                            bind.mediaInfoPrequel.visibility = View.VISIBLE
+                                mediaInfoPrequel.visibility = View.VISIBLE
-                            bind.mediaInfoPrequelImage.loadImage(
+                                mediaInfoPrequelImage.loadImage(
                                    media.prequel!!.banner ?: media.prequel!!.cover
                                )
-                            bind.mediaInfoPrequel.setSafeOnClickListener {
+                                mediaInfoPrequel.setSafeOnClickListener {
                                    ContextCompat.startActivity(
                                        requireContext(),
                                        Intent(
@ -455,71 +518,98 @@ class MediaInfoFragment : Fragment() {
                                    )
                                }
                            }
-                        parent.addView(bind.root)
+                            parent.addView(root)
                        }
                    }
-                    val bindi = ItemTitleRecyclerBinding.inflate(
+                    if (!media.review.isNullOrEmpty()) {
                        ItemTitleRecyclerBinding.inflate(
                            LayoutInflater.from(context),
                            parent,
                            false
                        ).apply {
                            val adapter = GroupieAdapter()
                            media.review!!.forEach { adapter.add(ReviewAdapter(it)) }
                            itemTitle.setText(R.string.reviews)
                            itemRecycler.adapter = adapter
                            itemRecycler.layoutManager = LinearLayoutManager(requireContext())
                            itemMore.visibility = View.VISIBLE
                            itemMore.setSafeOnClickListener {
                                startActivity(
                                    Intent(requireContext(), ReviewActivity::class.java)
                                        .putExtra("mediaId", media.id)
                                )
                            }
                            parent.addView(root)
                        }
                    }
-                    bindi.itemRecycler.adapter =
+                    ItemTitleRecyclerBinding.inflate(
                        LayoutInflater.from(context),
                        parent,
                        false
                    ).apply {
                        itemRecycler.adapter =
                            MediaAdaptor(0, media.relations!!, requireActivity())
-                    bindi.itemRecycler.layoutManager = LinearLayoutManager(
+                        itemRecycler.layoutManager = LinearLayoutManager(
                            requireContext(),
                            LinearLayoutManager.HORIZONTAL,
                            false
                        )
-                    parent.addView(bindi.root)
+                        parent.addView(root)
                    }
                }
                if (!media.characters.isNullOrEmpty() && !offline) {
-                    val bind = ItemTitleRecyclerBinding.inflate(
+                    ItemTitleRecyclerBinding.inflate(
                        LayoutInflater.from(context),
                        parent,
                        false
-                    )
+                    ).apply {
-                    bind.itemTitle.setText(R.string.characters)
+                        itemTitle.setText(R.string.characters)
-                    bind.itemRecycler.adapter =
+                        itemRecycler.adapter =
                            CharacterAdapter(media.characters!!)
-                    bind.itemRecycler.layoutManager = LinearLayoutManager(
+                        itemRecycler.layoutManager = LinearLayoutManager(
                            requireContext(),
                            LinearLayoutManager.HORIZONTAL,
                            false
                        )
-                    parent.addView(bind.root)
+                        parent.addView(root)
                    }
                }
                if (!media.staff.isNullOrEmpty() && !offline) {
-                    val bind = ItemTitleRecyclerBinding.inflate(
+                    ItemTitleRecyclerBinding.inflate(
                        LayoutInflater.from(context),
                        parent,
                        false
-                    )
+                    ).apply {
-                    bind.itemTitle.setText(R.string.staff)
+                        itemTitle.setText(R.string.staff)
-                    bind.itemRecycler.adapter =
+                        itemRecycler.adapter =
                            AuthorAdapter(media.staff!!)
-                    bind.itemRecycler.layoutManager = LinearLayoutManager(
+                        itemRecycler.layoutManager = LinearLayoutManager(
                            requireContext(),
                            LinearLayoutManager.HORIZONTAL,
                            false
                        )
-                    parent.addView(bind.root)
+                        parent.addView(root)
                    }
                }
                if (!media.recommendations.isNullOrEmpty() && !offline) {
-                    val bind = ItemTitleRecyclerBinding.inflate(
+                    ItemTitleRecyclerBinding.inflate(
                        LayoutInflater.from(context),
                        parent,
                        false
-                    )
+                    ).apply {
-                    bind.itemTitle.setText(R.string.recommended)
+                        itemTitle.setText(R.string.recommended)
-                    bind.itemRecycler.adapter =
+                        itemRecycler.adapter =
                            MediaAdaptor(0, media.recommendations!!, requireActivity())
-                    bind.itemRecycler.layoutManager = LinearLayoutManager(
+                        itemRecycler.layoutManager = LinearLayoutManager(
                            requireContext(),
                            LinearLayoutManager.HORIZONTAL,
                            false
                        )
-                    parent.addView(bind.root)
+                        parent.addView(root)
                    }
                }
            }
        }
@ -544,11 +634,12 @@ class MediaInfoFragment : Fragment() {
                }
            }
        }
        super.onViewCreated(view, null)
    }
    override fun onResume() {
-        binding.mediaInfoProgressBar.visibility = if (!loaded) View.VISIBLE else View.GONE
+        binding.mediaInfoProgressBar.isGone = loaded
        super.onResume()
    }
--- a/app/src/main/java/ani/dantotsu/media/MediaListDialogFragment.kt
+++ b/app/src/main/java/ani/dantotsu/media/MediaListDialogFragment.kt
@ -1,6 +1,5 @@
 package ani.dantotsu.media
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.text.InputFilter.LengthFilter
 import android.view.Gravity
@ -11,11 +10,19 @@ import android.widget.ArrayAdapter
 import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
-import ani.dantotsu.*
+import ani.dantotsu.BottomSheetDialogFragment
 import ani.dantotsu.DatePickerFragment
 import ani.dantotsu.InputFilterMinMax
 import ani.dantotsu.R
 import ani.dantotsu.Refresh
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.connections.anilist.api.FuzzyDate
 import ani.dantotsu.connections.mal.MAL
 import ani.dantotsu.databinding.BottomSheetMediaListBinding
 import ani.dantotsu.navBarHeight
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.snackString
 import ani.dantotsu.tryWith
 import com.google.android.material.materialswitch.MaterialSwitch
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@ -36,7 +43,6 @@ class MediaListDialogFragment : BottomSheetDialogFragment() {
        return binding.root
    }
    @SuppressLint("SetTextI18n")
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        binding.mediaListContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin += navBarHeight }
        var media: Media?
@ -168,9 +174,10 @@ class MediaListDialogFragment : BottomSheetDialogFragment() {
                    val init =
                        if (binding.mediaListProgress.text.toString() != "") binding.mediaListProgress.text.toString()
                            .toInt() else 0
-                    if (init < (total
+                    if (init < (total ?: 5000)) {
-                            ?: 5000)
+                        val progressText = "${init + 1}"
-                    ) binding.mediaListProgress.setText((init + 1).toString())
+                        binding.mediaListProgress.setText(progressText)
                    }
                    if (init + 1 == (total ?: 5000)) {
                        binding.mediaListStatus.setText(statusStrings[2], false)
                        onComplete()
@ -181,7 +188,12 @@ class MediaListDialogFragment : BottomSheetDialogFragment() {
                binding.mediaListPrivate.setOnCheckedChangeListener { _, checked ->
                    media?.isListPrivate = checked
                }
-
+                val removeList = PrefManager.getCustomVal("removeList", setOf<Int>())
                var remove: Boolean? = null
                binding.mediaListShow.isChecked = media?.id in removeList
                binding.mediaListShow.setOnCheckedChangeListener { _, checked ->
                    remove = checked
                }
                media?.userRepeat?.apply {
                    binding.mediaListRewatch.setText(this.toString())
                }
@ -247,6 +259,11 @@ class MediaListDialogFragment : BottomSheetDialogFragment() {
                                )
                            }
                        }
                        if (remove == true) {
                            PrefManager.setCustomVal("removeList", removeList.plus(media!!.id))
                        } else if (remove == false) {
                            PrefManager.setCustomVal("removeList", removeList.minus(media!!.id))
                        }
                        Refresh.all()
                        snackString(getString(R.string.list_updated))
                        dismissAllowingStateLoss()
@ -269,6 +286,7 @@ class MediaListDialogFragment : BottomSheetDialogFragment() {
                                }
                            }
                        }
                        PrefManager.setCustomVal("removeList", removeList.minus(media?.id))
                    }
                    if (id != null) {
                        Refresh.all()
--- a/app/src/main/java/ani/dantotsu/media/MediaListDialogSmallFragment.kt
+++ b/app/src/main/java/ani/dantotsu/media/MediaListDialogSmallFragment.kt
@ -1,6 +1,5 @@
 package ani.dantotsu.media
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.text.InputFilter.LengthFilter
 import android.view.Gravity
@ -10,11 +9,17 @@ import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.lifecycleScope
-import ani.dantotsu.*
+import ani.dantotsu.BottomSheetDialogFragment
 import ani.dantotsu.InputFilterMinMax
 import ani.dantotsu.R
 import ani.dantotsu.Refresh
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.connections.mal.MAL
 import ani.dantotsu.databinding.BottomSheetMediaListSmallBinding
 import ani.dantotsu.navBarHeight
 import ani.dantotsu.others.getSerialized
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.snackString
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@ -54,7 +59,6 @@ class MediaListDialogSmallFragment : BottomSheetDialogFragment() {
    }
    @SuppressLint("SetTextI18n")
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        binding.mediaListContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin += navBarHeight }
        val scope = viewLifecycleOwner.lifecycleScope
@ -68,7 +72,7 @@ class MediaListDialogSmallFragment : BottomSheetDialogFragment() {
                            MAL.query.deleteList(media.anime != null, media.idMAL)
                        } catch (e: Exception) {
                            withContext(Dispatchers.Main) {
-                                snackString("Failed to delete because of... ${e.message}")
+                                snackString(getString(R.string.delete_fail_reason, e.message))
                            }
                            return@withContext
                        }
@ -154,7 +158,10 @@ class MediaListDialogSmallFragment : BottomSheetDialogFragment() {
            val init =
                if (binding.mediaListProgress.text.toString() != "") binding.mediaListProgress.text.toString()
                    .toInt() else 0
-            if (init < (total ?: 5000)) binding.mediaListProgress.setText((init + 1).toString())
+            if (init < (total ?: 5000)) {
                val progressText = "${init + 1}"
                binding.mediaListProgress.setText(progressText)
            }
            if (init + 1 == (total ?: 5000)) {
                binding.mediaListStatus.setText(statusStrings[2], false)
            }
@ -164,7 +171,12 @@ class MediaListDialogSmallFragment : BottomSheetDialogFragment() {
        binding.mediaListPrivate.setOnCheckedChangeListener { _, checked ->
            media.isListPrivate = checked
        }
-
+        val removeList = PrefManager.getCustomVal("removeList", setOf<Int>())
        var remove: Boolean? = null
        binding.mediaListShow.isChecked = media.id in removeList
        binding.mediaListShow.setOnCheckedChangeListener { _, checked ->
            remove = checked
        }
        binding.mediaListSave.setOnClickListener {
            scope.launch {
                withContext(Dispatchers.IO) {
@ -192,6 +204,11 @@ class MediaListDialogSmallFragment : BottomSheetDialogFragment() {
                        )
                    }
                }
                if (remove == true) {
                    PrefManager.setCustomVal("removeList", removeList.plus(media.id))
                } else if (remove == false) {
                    PrefManager.setCustomVal("removeList", removeList.minus(media.id))
                }
                Refresh.all()
                snackString(getString(R.string.list_updated))
                dismissAllowingStateLoss()
--- a/app/src/main/java/ani/dantotsu/media/MediaListViewActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/MediaListViewActivity.kt
@ -0,0 +1,93 @@
 package ani.dantotsu.media
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import android.view.Window
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.updateLayoutParams
 import androidx.recyclerview.widget.GridLayoutManager
 import ani.dantotsu.R
 import ani.dantotsu.databinding.ActivityMediaListViewBinding
 import ani.dantotsu.getThemeColor
 import ani.dantotsu.hideSystemBarsExtendView
 import ani.dantotsu.initActivity
 import ani.dantotsu.others.getSerialized
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.statusBarHeight
 import ani.dantotsu.themes.ThemeManager
 import java.util.ArrayList
 class MediaListViewActivity: AppCompatActivity() {
    private lateinit var binding: ActivityMediaListViewBinding
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        binding = ActivityMediaListViewBinding.inflate(layoutInflater)
        ThemeManager(this).applyTheme()
        initActivity(this)
        if (!PrefManager.getVal<Boolean>(PrefName.ImmersiveMode)) {
            this.window.statusBarColor =
                ContextCompat.getColor(this, R.color.nav_bg_inv)
            binding.root.fitsSystemWindows = true
        } else {
            binding.root.fitsSystemWindows = false
            requestWindowFeature(Window.FEATURE_NO_TITLE)
            hideSystemBarsExtendView()
            binding.settingsContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                topMargin = statusBarHeight
            }
        }
        setContentView(binding.root)
        val primaryColor = getThemeColor(com.google.android.material.R.attr.colorSurface)
        val primaryTextColor = getThemeColor(com.google.android.material.R.attr.colorPrimary)
        val secondaryTextColor = getThemeColor(com.google.android.material.R.attr.colorOutline)
        window.statusBarColor = primaryColor
        window.navigationBarColor = primaryColor
        binding.listAppBar.setBackgroundColor(primaryColor)
        binding.listTitle.setTextColor(primaryTextColor)
        val screenWidth = resources.displayMetrics.run { widthPixels / density }
        val mediaList = passedMedia ?: intent.getSerialized("media") as? ArrayList<Media> ?: ArrayList()
        if (passedMedia != null) passedMedia = null
        val view = PrefManager.getCustomVal("mediaView", 0)
        var mediaView: View = when (view) {
            1 -> binding.mediaList
            0 -> binding.mediaGrid
            else -> binding.mediaGrid
        }
        mediaView.alpha = 1f
        fun changeView(mode: Int, current: View) {
            mediaView.alpha = 0.33f
            mediaView = current
            current.alpha = 1f
            PrefManager.setCustomVal("mediaView", mode)
            binding.mediaRecyclerView.adapter = MediaAdaptor(mode, mediaList, this)
            binding.mediaRecyclerView.layoutManager = GridLayoutManager(
                this,
                if (mode == 1) 1 else (screenWidth / 120f).toInt()
            )
        }
        binding.mediaList.setOnClickListener {
            changeView(1, binding.mediaList)
        }
        binding.mediaGrid.setOnClickListener {
            changeView(0, binding.mediaGrid)
        }
        val text = "${intent.getStringExtra("title")} (${mediaList.count()})"
        binding.listTitle.text = text
        binding.mediaRecyclerView.adapter = MediaAdaptor(view, mediaList, this)
        binding.mediaRecyclerView.layoutManager = GridLayoutManager(
            this,
            if (view == 1) 1 else (screenWidth / 120f).toInt()
        )
    }
    companion object {
        var passedMedia: ArrayList<Media>? = null
    }
 }
--- a/app/src/main/java/ani/dantotsu/media/MediaNameAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/media/MediaNameAdapter.kt
@ -0,0 +1,146 @@
 package ani.dantotsu.media
 import java.util.Locale
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 object MediaNameAdapter {
    private const val REGEX_ITEM = "[\\s:.\\-]*(\\d+\\.?\\d*)[\\s:.\\-]*"
    private const val REGEX_PART_NUMBER = "(?<!part\\s)\\b(\\d+)\\b"
    private const val REGEX_EPISODE =
        "(episode|episodio|ep|e)${REGEX_ITEM}\\(?\\s*(sub|subbed|dub|dubbed)*\\s*\\)?\\s*"
    private const val REGEX_SEASON = "(season|s)[\\s:.\\-]*(\\d+)[\\s:.\\-]*"
    private const val REGEX_SUBDUB = "^(soft)?[\\s-]*(sub|dub|mixed)(bed|s)?\\s*$"
    private const val REGEX_CHAPTER = "(chapter|chap|ch|c)${REGEX_ITEM}"
    fun setSubDub(text: String, typeToSetTo: SubDubType): String? {
        val subdubPattern: Pattern = Pattern.compile(REGEX_SUBDUB, Pattern.CASE_INSENSITIVE)
        val subdubMatcher: Matcher = subdubPattern.matcher(text)
        return if (subdubMatcher.find()) {
            val soft = subdubMatcher.group(1)
            val subdub = subdubMatcher.group(2)
            val bed = subdubMatcher.group(3) ?: ""
            val toggled = when (typeToSetTo) {
                SubDubType.SUB -> "sub"
                SubDubType.DUB -> "dub"
                SubDubType.NULL -> ""
            }
            val toggledCasePreserved =
                if (subdub?.get(0)?.isUpperCase() == true || soft?.get(0)
                        ?.isUpperCase() == true
                ) toggled.replaceFirstChar {
                    if (it.isLowerCase()) it.titlecase(
                        Locale.ROOT
                    ) else it.toString()
                } else toggled
            subdubMatcher.replaceFirst(toggledCasePreserved + bed)
        } else {
            null
        }
    }
    fun getSubDub(text: String): SubDubType {
        val subdubPattern: Pattern = Pattern.compile(REGEX_SUBDUB, Pattern.CASE_INSENSITIVE)
        val subdubMatcher: Matcher = subdubPattern.matcher(text)
        return if (subdubMatcher.find()) {
            val subdub = subdubMatcher.group(2)?.lowercase(Locale.ROOT)
            when (subdub) {
                "sub" -> SubDubType.SUB
                "dub" -> SubDubType.DUB
                else -> SubDubType.NULL
            }
        } else {
            SubDubType.NULL
        }
    }
    enum class SubDubType {
        SUB, DUB, NULL
    }
    fun findSeasonNumber(text: String): Int? {
        val seasonPattern: Pattern = Pattern.compile(REGEX_SEASON, Pattern.CASE_INSENSITIVE)
        val seasonMatcher: Matcher = seasonPattern.matcher(text)
        return if (seasonMatcher.find()) {
            seasonMatcher.group(2)?.toInt()
        } else {
            text.toIntOrNull()
        }
    }
    fun findEpisodeNumber(text: String): Float? {
        val episodePattern: Pattern = Pattern.compile(REGEX_EPISODE, Pattern.CASE_INSENSITIVE)
        val episodeMatcher: Matcher = episodePattern.matcher(text)
        return if (episodeMatcher.find()) {
            if (episodeMatcher.group(2) != null) {
                episodeMatcher.group(2)?.toFloat()
            } else {
                val failedEpisodeNumberPattern: Pattern =
                    Pattern.compile(REGEX_PART_NUMBER, Pattern.CASE_INSENSITIVE)
                val failedEpisodeNumberMatcher: Matcher =
                    failedEpisodeNumberPattern.matcher(text)
                if (failedEpisodeNumberMatcher.find()) {
                    failedEpisodeNumberMatcher.group(1)?.toFloat()
                } else {
                    null
                }
            }
        } else {
            text.toFloatOrNull()
        }
    }
    fun removeEpisodeNumber(text: String): String {
        val regexPattern = Regex(REGEX_EPISODE, RegexOption.IGNORE_CASE)
        val removedNumber = text.replace(regexPattern, "").ifEmpty {
            text
        }
        val letterPattern = Regex("[a-zA-Z]")
        return if (letterPattern.containsMatchIn(removedNumber)) {
            removedNumber
        } else {
            text
        }
    }
    fun removeEpisodeNumberCompletely(text: String): String {
        val regexPattern = Regex(REGEX_EPISODE, RegexOption.IGNORE_CASE)
        val removedNumber = text.replace(regexPattern, "")
        return if (removedNumber.equals(text, true)) {  // if nothing was removed
            val failedEpisodeNumberPattern =
                Regex(REGEX_PART_NUMBER, RegexOption.IGNORE_CASE)
            failedEpisodeNumberPattern.replace(removedNumber) { mr ->
                mr.value.replaceFirst(mr.groupValues[1], "")
            }
        } else {
            removedNumber
        }
    }
    fun findChapterNumber(text: String): Float? {
        val pattern: Pattern = Pattern.compile(REGEX_CHAPTER, Pattern.CASE_INSENSITIVE)
        val matcher: Matcher = pattern.matcher(text)
        return if (matcher.find()) {
            matcher.group(2)?.toFloat()
        } else {
            val failedChapterNumberPattern: Pattern =
                Pattern.compile(REGEX_PART_NUMBER, Pattern.CASE_INSENSITIVE)
            val failedChapterNumberMatcher: Matcher =
                failedChapterNumberPattern.matcher(text)
            if (failedChapterNumberMatcher.find()) {
                failedChapterNumberMatcher.group(1)?.toFloat()
            } else {
                text.toFloatOrNull()
            }
        }
    }
 }
--- a/app/src/main/java/ani/dantotsu/media/MediaSocialAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/media/MediaSocialAdapter.kt
@ -0,0 +1,82 @@
 package ani.dantotsu.media
 import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
 import ani.dantotsu.R
 import ani.dantotsu.databinding.ItemFollowerGridBinding
 import ani.dantotsu.getAppString
 import ani.dantotsu.loadImage
 import ani.dantotsu.others.ImageViewDialog
 import ani.dantotsu.profile.ProfileActivity
 import ani.dantotsu.profile.User
 import ani.dantotsu.setAnimation
 class MediaSocialAdapter(
    val user: ArrayList<User>,
    val type: String,
    val activity: FragmentActivity
 ) : RecyclerView.Adapter<MediaSocialAdapter.FollowerGridViewHolder>() {
    inner class FollowerGridViewHolder(val binding: ItemFollowerGridBinding) :
        RecyclerView.ViewHolder(binding.root)
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FollowerGridViewHolder {
        return FollowerGridViewHolder(
            ItemFollowerGridBinding.inflate(
                LayoutInflater.from(parent.context),
                parent,
                false
            )
        )
    }
    override fun onBindViewHolder(holder: FollowerGridViewHolder, position: Int) {
        holder.binding.apply {
            val user = user[position]
            val score = user.score?.div(10.0) ?: 0.0
            setAnimation(root.context, root)
            profileUserName.text = user.name
            profileInfo.apply {
                text = when (user.status) {
                    "CURRENT" -> if (type == "ANIME") getAppString(R.string.watching) else getAppString(R.string.reading)
                    else -> user.status ?: ""
                }
                visibility = View.VISIBLE
            }
            profileCompactUserProgress.text = user.progress.toString()
            profileCompactScore.text = score.toString()
            " | ${user.totalEpisodes ?: "~"}".also { profileCompactTotal.text = it }
            profileUserAvatar.loadImage(user.pfp)
            val scoreDrawable = if (score == 0.0) R.drawable.score else R.drawable.user_score
            profileCompactScoreBG.apply {
                visibility = View.VISIBLE
                background = ContextCompat.getDrawable(root.context, scoreDrawable)
            }
            profileCompactProgressContainer.visibility = View.VISIBLE
            profileUserAvatar.setOnClickListener {
                ContextCompat.startActivity(root.context,
                    Intent(root.context, ProfileActivity::class.java)
                        .putExtra("userId", user.id),
                    null)
            }
            profileUserAvatarContainer.setOnLongClickListener {
                ImageViewDialog.newInstance(
                    activity,
                    activity.getString(R.string.avatar, user.name),
                    user.pfp
                )
            }
        }
    }
    override fun getItemCount(): Int = user.size
 }
--- a/app/src/main/java/ani/dantotsu/media/MediaType.kt
+++ b/app/src/main/java/ani/dantotsu/media/MediaType.kt
@ -0,0 +1,56 @@
 package ani.dantotsu.media
 interface Type {
    fun asText(): String
 }
 enum class MediaType : Type {
    ANIME,
    MANGA,
    NOVEL;
    override fun asText(): String {
        return when (this) {
            ANIME -> "Anime"
            MANGA -> "Manga"
            NOVEL -> "Novel"
        }
    }
    companion object {
        fun fromText(string: String): MediaType? {
            return when (string) {
                "Anime" -> ANIME
                "Manga" -> MANGA
                "Novel" -> NOVEL
                else -> {
                    null
                }
            }
        }
    }
 }
 enum class AddonType : Type {
    TORRENT,
    DOWNLOAD;
    override fun asText(): String {
        return when (this) {
            TORRENT -> "Torrent"
            DOWNLOAD -> "Download"
        }
    }
    companion object {
        fun fromText(string: String): AddonType? {
            return when (string) {
                "Torrent" -> TORRENT
                "Download" -> DOWNLOAD
                else -> {
                    null
                }
            }
        }
    }
 }
--- a/app/src/main/java/ani/dantotsu/media/OtherDetailsViewModel.kt
+++ b/app/src/main/java/ani/dantotsu/media/OtherDetailsViewModel.kt
@ -30,7 +30,7 @@ class OtherDetailsViewModel : ViewModel() {
    fun getCalendar(): LiveData<Map<String, MutableList<Media>>> = calendar
    suspend fun loadCalendar() {
        val curr = System.currentTimeMillis() / 1000
-        val res = Anilist.query.recentlyUpdated(false, curr - 86400, curr + (86400 * 6))
+        val res = Anilist.query.recentlyUpdated(curr - 86400, curr + (86400 * 6))
        val df = DateFormat.getDateInstance(DateFormat.FULL)
        val map = mutableMapOf<String, MutableList<Media>>()
        val idMap = mutableMapOf<String, MutableList<Int>>()
--- a/app/src/main/java/ani/dantotsu/media/ProgressAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/media/ProgressAdapter.kt
@ -27,7 +27,7 @@ class ProgressAdapter(private val horizontal: Boolean = true, searched: Boolean)
        return ProgressViewHolder(binding)
    }
-    @SuppressLint("SetTextI18n", "ClickableViewAccessibility")
+    @SuppressLint("ClickableViewAccessibility")
    override fun onBindViewHolder(holder: ProgressViewHolder, position: Int) {
        val progressBar = holder.binding.root
        bar = progressBar
--- a/app/src/main/java/ani/dantotsu/media/ReviewActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/ReviewActivity.kt
@ -0,0 +1,127 @@
 package ani.dantotsu.media
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
 import android.text.SpannableString
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import ani.dantotsu.R
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.connections.anilist.api.Query
 import ani.dantotsu.databinding.ActivityFollowBinding
 import ani.dantotsu.initActivity
 import ani.dantotsu.navBarHeight
 import ani.dantotsu.statusBarHeight
 import ani.dantotsu.themes.ThemeManager
 import ani.dantotsu.util.MarkdownCreatorActivity
 import com.xwray.groupie.GroupieAdapter
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 class ReviewActivity : AppCompatActivity() {
    private lateinit var binding: ActivityFollowBinding
    val adapter = GroupieAdapter()
    private val reviews = mutableListOf<Query.Review>()
    var mediaId = 0
    private var currentPage: Int = 1
    private var hasNextPage: Boolean = true
    @SuppressLint("ClickableViewAccessibility")
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        ThemeManager(this).applyTheme()
        initActivity(this)
        binding = ActivityFollowBinding.inflate(layoutInflater)
        binding.listToolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
            topMargin = statusBarHeight
        }
        binding.listFrameLayout.updateLayoutParams<ViewGroup.MarginLayoutParams> {
            bottomMargin = navBarHeight
        }
        setContentView(binding.root)
        mediaId = intent.getIntExtra("mediaId", -1)
        if (mediaId == -1) {
            finish()
            return
        }
        binding.followerGrid.visibility = View.GONE
        binding.followerList.visibility = View.GONE
        binding.followFilterButton.setImageResource(R.drawable.ic_add)
        binding.followFilterButton.setOnClickListener {
            ContextCompat.startActivity(
                this,
                Intent(this, MarkdownCreatorActivity::class.java)
                    .putExtra("type", "review"),
                null
            )
        }
        binding.followFilterButton.visibility = View.GONE
        binding.listTitle.text = getString(R.string.reviews)
        binding.listRecyclerView.adapter = adapter
        binding.listRecyclerView.layoutManager = LinearLayoutManager(
            this,
            LinearLayoutManager.VERTICAL,
            false
        )
        binding.listProgressBar.visibility = View.VISIBLE
        binding.listBack.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
        lifecycleScope.launch(Dispatchers.IO) {
            val response = Anilist.query.getReviews(mediaId)?.data?.page
            withContext(Dispatchers.Main) {
                binding.listProgressBar.visibility = View.GONE
                binding.listRecyclerView.setOnTouchListener { _, event ->
                    if (event?.action == MotionEvent.ACTION_UP) {
                        if (hasNextPage && !binding.listRecyclerView.canScrollVertically(1) && !binding.followRefresh.isVisible
                            && binding.listRecyclerView.adapter!!.itemCount != 0 &&
                            (binding.listRecyclerView.layoutManager as LinearLayoutManager).findLastVisibleItemPosition() == (binding.listRecyclerView.adapter!!.itemCount - 1)
                        ) {
                            binding.followRefresh.visibility = ViewGroup.VISIBLE
                            loadPage(++currentPage) {
                                binding.followRefresh.visibility = ViewGroup.GONE
                            }
                        }
                    }
                    false
                }
                currentPage = response?.pageInfo?.currentPage ?: 1
                hasNextPage = response?.pageInfo?.hasNextPage ?: false
                response?.reviews?.let {
                    reviews.addAll(it)
                    fillList()
                }
            }
        }
    }
    private fun loadPage(page: Int, callback: () -> Unit) {
        lifecycleScope.launch(Dispatchers.IO) {
            val response = Anilist.query.getReviews(mediaId, page)
            currentPage = response?.data?.page?.pageInfo?.currentPage ?: 1
            hasNextPage = response?.data?.page?.pageInfo?.hasNextPage ?: false
            withContext(Dispatchers.Main) {
                response?.data?.page?.reviews?.let {
                    reviews.addAll(it)
                    fillList()
                }
                callback()
            }
        }
    }
    private fun fillList() {
        adapter.clear()
        reviews.forEach {
            adapter.add(ReviewAdapter(it))
        }
    }
 }
--- a/app/src/main/java/ani/dantotsu/media/ReviewAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/media/ReviewAdapter.kt
@ -0,0 +1,167 @@
 package ani.dantotsu.media
 import android.app.Activity
 import android.content.Intent
 import android.view.View
 import androidx.activity.ComponentActivity
 import androidx.core.app.ActivityOptionsCompat
 import androidx.core.content.ContextCompat
 import androidx.core.util.Pair
 import androidx.core.view.ViewCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import ani.dantotsu.R
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.connections.anilist.api.Query
 import ani.dantotsu.databinding.ItemReviewsBinding
 import ani.dantotsu.loadImage
 import ani.dantotsu.openImage
 import ani.dantotsu.others.ImageViewDialog
 import ani.dantotsu.profile.ProfileActivity
 import ani.dantotsu.profile.activity.ActivityItemBuilder
 import ani.dantotsu.toast
 import com.xwray.groupie.viewbinding.BindableItem
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 class ReviewAdapter(
    private var review: Query.Review,
 ) : BindableItem<ItemReviewsBinding>() {
    private lateinit var binding: ItemReviewsBinding
    override fun bind(viewBinding: ItemReviewsBinding, position: Int) {
        binding = viewBinding
        val context = binding.root.context
        binding.reviewUserName.text = review.user?.name
        binding.reviewUserAvatar.loadImage(review.user?.avatar?.medium)
        binding.reviewText.text = review.summary
        binding.reviewPostTime.text = ActivityItemBuilder.getDateTime(review.createdAt)
        val text = "[${review.score/ 10.0f}]"
        binding.reviewTag.text = text
        binding.root.setOnClickListener {
            ContextCompat.startActivity(
                context,
                Intent(context, ReviewViewActivity::class.java)
                    .putExtra("review", review),
                null
            )
        }
        binding.reviewUserName.setOnClickListener {
            ContextCompat.startActivity(
                context,
                Intent(context, ProfileActivity::class.java)
                    .putExtra("userId", review.user?.id),
                null
            )
        }
        binding.reviewUserAvatar.setOnClickListener {
            ContextCompat.startActivity(
                context,
                Intent(context, ProfileActivity::class.java)
                    .putExtra("userId", review.user?.id),
                null
            )
        }
        binding.reviewUserAvatar.openImage(
            context.getString(
                R.string.avatar,
                review.user?.name
            ),
            review.user?.avatar?.medium ?: ""
        )
        userVote(review.userRating)
        enableVote()
        binding.reviewTotalVotes.text = review.rating.toString()
    }
    override fun getLayout(): Int {
        return R.layout.item_reviews
    }
    override fun initializeViewBinding(view: View): ItemReviewsBinding {
        return ItemReviewsBinding.bind(view)
    }
    private fun userVote(type: String) {
        when (type) {
            "NO_VOTE" -> {
                binding.reviewUpVote.setImageResource(R.drawable.ic_round_upvote_inactive_24)
                binding.reviewDownVote.setImageResource(R.drawable.ic_round_upvote_inactive_24)
                binding.reviewUpVote.alpha = 0.6f
                binding.reviewDownVote.alpha = 0.6f
            }
            "UP_VOTE" -> {
                binding.reviewUpVote.setImageResource(R.drawable.ic_round_upvote_active_24)
                binding.reviewDownVote.setImageResource(R.drawable.ic_round_upvote_inactive_24)
                binding.reviewUpVote.alpha = 1f
                binding.reviewDownVote.alpha = 0.6f
            }
            "DOWN_VOTE" -> {
                binding.reviewUpVote.setImageResource(R.drawable.ic_round_upvote_inactive_24)
                binding.reviewDownVote.setImageResource(R.drawable.ic_round_upvote_active_24)
                binding.reviewDownVote.alpha = 1f
                binding.reviewUpVote.alpha = 0.6f
            }
        }
    }
    private fun rateReview(rating: String) {
        disableVote()
        val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
        scope.launch {
            val result = Anilist.mutation.rateReview(review.id, rating)
            if (result != null) {
                withContext(Dispatchers.Main) {
                    val res = result.data.rateReview
                    review.rating = res.rating
                    review.ratingAmount = res.ratingAmount
                    review.userRating = res.userRating
                    userVote(review.userRating)
                    binding.reviewTotalVotes.text = review.rating.toString()
                    userVote(review.userRating)
                    enableVote()
                }
            } else {
                withContext(Dispatchers.Main) {
                    toast(
                        binding.root.context.getString(R.string.error_message, "response is null")
                    )
                    enableVote()
                }
            }
        }
    }
    private fun disableVote() {
        binding.reviewUpVote.setOnClickListener(null)
        binding.reviewDownVote.setOnClickListener(null)
        binding.reviewUpVote.isEnabled = false
        binding.reviewDownVote.isEnabled = false
    }
    private fun enableVote() {
        binding.reviewUpVote.setOnClickListener {
            if (review.userRating == "UP_VOTE") {
                rateReview("NO_VOTE")
            } else {
                rateReview("UP_VOTE")
            }
            disableVote()
        }
        binding.reviewDownVote.setOnClickListener {
            if (review.userRating == "DOWN_VOTE") {
                rateReview("NO_VOTE")
            } else {
                rateReview("DOWN_VOTE")
            }
            disableVote()
        }
        binding.reviewUpVote.isEnabled = true
        binding.reviewDownVote.isEnabled = true
    }
 }
--- a/app/src/main/java/ani/dantotsu/media/ReviewViewActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/ReviewViewActivity.kt
@ -0,0 +1,196 @@
 package ani.dantotsu.media
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.lifecycleScope
 import ani.dantotsu.R
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.connections.anilist.api.Query
 import ani.dantotsu.databinding.ActivityReviewViewBinding
 import ani.dantotsu.getThemeColor
 import ani.dantotsu.initActivity
 import ani.dantotsu.loadImage
 import ani.dantotsu.navBarHeight
 import ani.dantotsu.openImage
 import ani.dantotsu.others.ImageViewDialog
 import ani.dantotsu.profile.ProfileActivity
 import ani.dantotsu.profile.activity.ActivityItemBuilder
 import ani.dantotsu.statusBarHeight
 import ani.dantotsu.themes.ThemeManager
 import ani.dantotsu.toast
 import ani.dantotsu.util.AniMarkdown
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 class ReviewViewActivity : AppCompatActivity() {
    private lateinit var binding: ActivityReviewViewBinding
    private lateinit var review: Query.Review
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        ThemeManager(this).applyTheme()
        initActivity(this)
        binding = ActivityReviewViewBinding.inflate(layoutInflater)
        binding.userContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {
            topMargin = statusBarHeight
        }
        binding.reviewContent.updateLayoutParams<ViewGroup.MarginLayoutParams> {
            bottomMargin += navBarHeight
        }
        setContentView(binding.root)
        review = intent.getSerializableExtra("review") as Query.Review
        binding.userName.text = review.user?.name
        binding.userAvatar.loadImage(review.user?.avatar?.medium)
        binding.userTime.text = ActivityItemBuilder.getDateTime(review.createdAt)
        binding.userContainer.setOnClickListener {
            startActivity(Intent(this, ProfileActivity::class.java)
                .putExtra("userId", review.user?.id)
            )
        }
        binding.userAvatar.openImage(
            binding.root.context.getString(R.string.avatar, review.user?.name),
            review.user?.avatar?.medium ?: ""
        )
        binding.userAvatar.setOnClickListener {
            startActivity(Intent(this, ProfileActivity::class.java)
                .putExtra("userId", review.user?.id)
            )
        }
        binding.profileUserBio.settings.loadWithOverviewMode = true
        binding.profileUserBio.settings.useWideViewPort = true
        binding.profileUserBio.setInitialScale(1)
        val styledHtml = AniMarkdown.getFullAniHTML(
            review.body,
            ContextCompat.getColor(this, R.color.bg_opp)
        )
        binding.profileUserBio.loadDataWithBaseURL(
            null,
            styledHtml,
            "text/html",
            "utf-8",
            null
        )
        binding.profileUserBio.setBackgroundColor(
            ContextCompat.getColor(
                this,
                android.R.color.transparent
            )
        )
        binding.profileUserBio.setLayerType(View.LAYER_TYPE_HARDWARE, null)
        binding.profileUserBio.webViewClient = object : WebViewClient() {
            override fun onPageFinished(view: WebView?, url: String?) {
                super.onPageFinished(view, url)
                binding.profileUserBio.setBackgroundColor(
                    ContextCompat.getColor(
                        this@ReviewViewActivity,
                        android.R.color.transparent
                    )
                )
            }
            override fun shouldOverrideUrlLoading(
                view: WebView?,
                request: WebResourceRequest?
            ): Boolean {
                return true
            }
        }
        userVote(review.userRating)
        enableVote()
        binding.voteCount.text = review.rating.toString()
        binding.voteText.text = getString(
            R.string.vote_out_of_total,
            review.rating.toString(),
            review.ratingAmount.toString()
        )
    }
    private fun userVote(type: String) {
        val selectedColor = getThemeColor(com.google.android.material.R.attr.colorPrimary)
        val unselectedColor = getThemeColor(androidx.appcompat.R.attr.colorControlNormal)
        when (type) {
            "NO_VOTE" -> {
                binding.upvote.setColorFilter(unselectedColor)
                binding.downvote.setColorFilter(unselectedColor)
            }
            "UP_VOTE" -> {
                binding.upvote.setColorFilter(selectedColor)
                binding.downvote.setColorFilter(unselectedColor)
            }
            "DOWN_VOTE" -> {
                binding.upvote.setColorFilter(unselectedColor)
                binding.downvote.setColorFilter(selectedColor)
            }
        }
    }
    private fun rateReview(rating: String) {
        disableVote()
        lifecycleScope.launch {
            val result = Anilist.mutation.rateReview(review.id, rating)
            if (result != null) {
                withContext(Dispatchers.Main) {
                    val res = result.data.rateReview
                    review.rating = res.rating
                    review.ratingAmount = res.ratingAmount
                    review.userRating = res.userRating
                    userVote(review.userRating)
                    binding.voteCount.text = review.rating.toString()
                    binding.voteText.text = getString(
                        R.string.vote_out_of_total,
                        review.rating.toString(),
                        review.ratingAmount.toString()
                    )
                    userVote(review.userRating)
                    enableVote()
                }
            } else {
                withContext(Dispatchers.Main) {
                    toast(
                        getString(R.string.error_message, "response is null")
                    )
                    enableVote()
                }
            }
        }
    }
    private fun disableVote() {
        binding.upvote.setOnClickListener(null)
        binding.downvote.setOnClickListener(null)
        binding.upvote.isEnabled = false
        binding.downvote.isEnabled = false
    }
    private fun enableVote() {
        binding.upvote.setOnClickListener {
            if (review.userRating == "UP_VOTE") {
                rateReview("NO_VOTE")
            } else {
                rateReview("UP_VOTE")
            }
            disableVote()
        }
        binding.downvote.setOnClickListener {
            if (review.userRating == "DOWN_VOTE") {
                rateReview("NO_VOTE")
            } else {
                rateReview("DOWN_VOTE")
            }
            disableVote()
        }
        binding.upvote.isEnabled = true
        binding.downvote.isEnabled = true
    }
 }
--- a/app/src/main/java/ani/dantotsu/media/SearchActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/SearchActivity.kt
@ -4,24 +4,30 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.View
 import android.view.WindowManager
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
 import androidx.core.view.updatePaddingRelative
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import ani.dantotsu.*
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.connections.anilist.AnilistSearch
 import ani.dantotsu.connections.anilist.SearchResults
 import ani.dantotsu.databinding.ActivitySearchBinding
 import ani.dantotsu.initActivity
 import ani.dantotsu.navBarHeight
 import ani.dantotsu.px
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.statusBarHeight
 import ani.dantotsu.themes.ThemeManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import java.util.*
+import java.util.Timer
 import java.util.TimerTask
 class SearchActivity : AppCompatActivity() {
    private lateinit var binding: ActivitySearchBinding
@ -64,11 +70,18 @@ class SearchActivity : AppCompatActivity() {
                intent.getStringExtra("type") ?: "ANIME",
                isAdult = if (Anilist.adult) intent.getBooleanExtra("hentai", false) else false,
                onList = listOnly,
                search = intent.getStringExtra("query"),
                genres = intent.getStringExtra("genre")?.let { mutableListOf(it) },
                tags = intent.getStringExtra("tag")?.let { mutableListOf(it) },
                sort = intent.getStringExtra("sortBy"),
                status = intent.getStringExtra("status"),
                source = intent.getStringExtra("source"),
                countryOfOrigin = intent.getStringExtra("country"),
                season = intent.getStringExtra("season"),
-                seasonYear = intent.getStringExtra("seasonYear")?.toIntOrNull(),
+                seasonYear = if (intent.getStringExtra("type") == "ANIME") intent.getStringExtra("seasonYear")
                    ?.toIntOrNull() else null,
                startYear = if (intent.getStringExtra("type") == "MANGA") intent.getStringExtra("seasonYear")
                    ?.toIntOrNull() else null,
                results = mutableListOf(),
                hasNextPage = false
            )
@ -127,8 +140,12 @@ class SearchActivity : AppCompatActivity() {
                    excludedTags = it.excludedTags
                    tags = it.tags
                    season = it.season
                    startYear = it.startYear
                    seasonYear = it.seasonYear
                    status = it.status
                    source = it.source
                    format = it.format
                    countryOfOrigin = it.countryOfOrigin
                    page = it.page
                    hasNextPage = it.hasNextPage
                }
@ -137,7 +154,7 @@ class SearchActivity : AppCompatActivity() {
                model.searchResults.results.addAll(it.results)
                mediaAdaptor.notifyItemRangeInserted(prev, it.results.size)
-                progressAdapter.bar?.visibility = if (it.hasNextPage) View.VISIBLE else View.GONE
+                progressAdapter.bar?.isVisible = it.hasNextPage
            }
        }
@ -151,7 +168,10 @@ class SearchActivity : AppCompatActivity() {
                } else
                    headerAdaptor.requestFocus?.run()
-                if (intent.getBooleanExtra("search", false)) search()
+                if (intent.getBooleanExtra("search", false)) {
                    window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED)
                    search()
                }
            }
        }
    }
--- a/app/src/main/java/ani/dantotsu/media/SearchAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/media/SearchAdapter.kt
@ -13,9 +13,9 @@ import android.view.animation.AlphaAnimation
 import android.view.animation.Animation
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.widget.PopupMenu
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat.startActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.HORIZONTAL
@ -28,7 +28,9 @@ import ani.dantotsu.openLinkInBrowser
 import ani.dantotsu.others.imagesearch.ImageSearchActivity
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
-import com.google.android.material.checkbox.MaterialCheckBox.*
+import com.google.android.material.checkbox.MaterialCheckBox.STATE_CHECKED
 import com.google.android.material.checkbox.MaterialCheckBox.STATE_INDETERMINATE
 import com.google.android.material.checkbox.MaterialCheckBox.STATE_UNCHECKED
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@ -44,6 +46,20 @@ class SearchAdapter(private val activity: SearchActivity, private val type: Stri
    private lateinit var searchHistoryAdapter: SearchHistoryAdapter
    private lateinit var binding: ItemSearchHeaderBinding
    private fun updateFilterTextViewDrawable() {
        val filterDrawable = when (activity.result.sort) {
            Anilist.sortBy[0] -> R.drawable.ic_round_area_chart_24
            Anilist.sortBy[1] -> R.drawable.ic_round_filter_peak_24
            Anilist.sortBy[2] -> R.drawable.ic_round_star_graph_24
            Anilist.sortBy[3] -> R.drawable.ic_round_new_releases_24
            Anilist.sortBy[4] -> R.drawable.ic_round_filter_list_24
            Anilist.sortBy[5] -> R.drawable.ic_round_filter_list_24_reverse
            Anilist.sortBy[6] -> R.drawable.ic_round_assist_walker_24
            else -> R.drawable.ic_round_filter_alt_24
        }
        binding.filterTextView.setCompoundDrawablesWithIntrinsicBounds(filterDrawable, 0, 0, 0)
    }
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SearchHeaderViewHolder {
        val binding =
            ItemSearchHeaderBinding.inflate(LayoutInflater.from(parent.context), parent, false)
@ -92,7 +108,7 @@ class SearchAdapter(private val activity: SearchActivity, private val type: Stri
        binding.searchAdultCheck.isChecked = adult
        binding.searchList.isChecked = listOnly == true
-        binding.searchChipRecycler.adapter = SearchChipAdapter(activity).also {
+        binding.searchChipRecycler.adapter = SearchChipAdapter(activity, this).also {
            activity.updateChips = { it.update() }
        }
@ -102,6 +118,68 @@ class SearchAdapter(private val activity: SearchActivity, private val type: Stri
        binding.searchFilter.setOnClickListener {
            SearchFilterBottomDialog.newInstance().show(activity.supportFragmentManager, "dialog")
        }
        binding.searchFilter.setOnLongClickListener {
            val popupMenu = PopupMenu(activity, binding.searchFilter)
            popupMenu.menuInflater.inflate(R.menu.sortby_filter_menu, popupMenu.menu)
            popupMenu.setOnMenuItemClickListener { item ->
                when (item.itemId) {
                    R.id.sort_by_score -> {
                        activity.result.sort = Anilist.sortBy[0]
                        activity.updateChips.invoke()
                        activity.search()
                        updateFilterTextViewDrawable()
                    }
                    R.id.sort_by_popular -> {
                        activity.result.sort = Anilist.sortBy[1]
                        activity.updateChips.invoke()
                        activity.search()
                        updateFilterTextViewDrawable()
                    }
                    R.id.sort_by_trending -> {
                        activity.result.sort = Anilist.sortBy[2]
                        activity.updateChips.invoke()
                        activity.search()
                        updateFilterTextViewDrawable()
                    }
                    R.id.sort_by_recent -> {
                        activity.result.sort = Anilist.sortBy[3]
                        activity.updateChips.invoke()
                        activity.search()
                        updateFilterTextViewDrawable()
                    }
                    R.id.sort_by_a_z -> {
                        activity.result.sort = Anilist.sortBy[4]
                        activity.updateChips.invoke()
                        activity.search()
                        updateFilterTextViewDrawable()
                    }
                    R.id.sort_by_z_a -> {
                        activity.result.sort = Anilist.sortBy[5]
                        activity.updateChips.invoke()
                        activity.search()
                        updateFilterTextViewDrawable()
                    }
                    R.id.sort_by_pure_pain -> {
                        activity.result.sort = Anilist.sortBy[6]
                        activity.updateChips.invoke()
                        activity.search()
                        updateFilterTextViewDrawable()
                    }
                }
                true
            }
            popupMenu.show()
            true
        }
        if (activity.result.type != "ANIME") {
            binding.searchByImage.visibility = View.GONE
        }
        binding.searchByImage.setOnClickListener {
            activity.startActivity(Intent(activity, ImageSearchActivity::class.java))
        }
@ -230,19 +308,20 @@ class SearchAdapter(private val activity: SearchActivity, private val type: Stri
    private fun fadeInAnimation(): Animation {
        return AlphaAnimation(0f, 1f).apply {
            duration = 150
            fillAfter = true
        }
    }
    private fun fadeOutAnimation(): Animation {
        return AlphaAnimation(1f, 0f).apply {
            duration = 150
            fillAfter = true
        }
    }
    fun addHistory() {
        if (::searchHistoryAdapter.isInitialized &&
            binding.searchBarText.text.toString().isNotBlank()
        )
            searchHistoryAdapter.add(binding.searchBarText.text.toString())
    }
@ -256,7 +335,10 @@ class SearchAdapter(private val activity: SearchActivity, private val type: Stri
    }
-    class SearchChipAdapter(val activity: SearchActivity) :
+    class SearchChipAdapter(
        val activity: SearchActivity,
        private val searchAdapter: SearchAdapter
    ) :
        RecyclerView.Adapter<SearchChipAdapter.SearchChipViewHolder>() {
        private var chips = activity.result.toChipList()
@ -273,11 +355,12 @@ class SearchAdapter(private val activity: SearchActivity, private val type: Stri
        override fun onBindViewHolder(holder: SearchChipViewHolder, position: Int) {
            val chip = chips[position]
            holder.binding.root.apply {
-                text = chip.text
+                text = chip.text.replace("_", " ")
                setOnClickListener {
                    activity.result.removeChip(chip)
                    update()
                    activity.search()
                    searchAdapter.updateFilterTextViewDrawable()
                }
            }
        }
@ -286,6 +369,7 @@ class SearchAdapter(private val activity: SearchActivity, private val type: Stri
        fun update() {
            chips = activity.result.toChipList()
            notifyDataSetChanged()
            searchAdapter.updateFilterTextViewDrawable()
        }
        override fun getItemCount(): Int = chips.size
--- a/Show more
+++ b/Show more