🚀 Launch 3.0.0+108

🐛 bunch of bugs fixes

CODE_OF_CONDUCT.md

@@ -0,0 +1,36 @@
+# Code of Conduct
+
+Welcome to the Solar Network / HyperNet project!
+
+We're welcome for any contribution, from bug reports to feature requests to code contributions.
+
+To get started, start from fork the repository.
+
+## Project Structure
+
+The current repository you're visiting is the front-end project for the Solar Network project. It's built by Flutter and also manages all feature requests and issues reports in this repository.
+
+The backend of the Solar Network is written in Go and is a microservices app. The code is stored separately in different repositories. They're linked in the README.MD, you can have a look and try to contribute if you want.
+
+## Commit Messages
+
+We're using the gitmoji to clarify the reason and changes of the commit. To learn more about gitmoji, visit https://gitmoji.dev
+
+All the commit message should follow `:[gitmoji]: <commit message>` syntax
+
+## Translations & Localization
+
+We're not accepting translation and localization improvements, or fixes on the GitHub or Solsynth Git Repository. If you want to contribute to those, please head to our Crowdin project: https://crowdin.com/project/solian
+
+## New Features
+
+To contribute new features, please create an issue or mention the feature you want in our official development chat channel. You should discuss the feature with us and the community first. You shouldn't just create a Pull Request for the feature you want, it will not be merged.
+
+## Bug Reports / Ask for help
+
+Read the error message, check for the update (including pre-releases), and wiki before creating an issue. At the same time, be respectful and don't argue with our developers and contributors in the development chat or GitHub issue. Otherwise your issue may got deleted and your Solar Network Account may got a strike. 
+
+-----------
+
+We appreciate every single commit you contributed. Let's work together and create a better Solar Network!
+

LICENSE.txt

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are 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.
+
+  When we speak of free software, we are referring to freedom, not
+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.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  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 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 work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero 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 your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  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 AGPL, see
+<https://www.gnu.org/licenses/>.

README.md

@@ -1,9 +1,10 @@
 # Solar Network
 
-> [!IMPORTANT]
-> You're visiting the Solar Network v3 branch, which is the next version and still under active development. **NOT READY FOR USE / PRODUCTION!**
+![](https://solsynth.dev/_nuxt/alpha.azUGRxzt.webp)
 
-![](https://solsynth.dev/_next/static/media/alpha.e779a584.webp)
+[![Crowdin](https://badges.crowdin.net/solian/localized.svg)](https://crowdin.com/project/solian)
+
+*Tap the badge above to help us tranlate!*
 
 Hello there! Welcome to the main repository of the DysonNetwork (also known as the Solar Network). The code here is mainly about the front-end app (also known as Solian). But you can still post issues here to get help and request new features!
 

android/app/build.gradle.kts

@@ -1,3 +1,6 @@
+import java.util.Properties
+import java.io.FileInputStream
+
 plugins {
     id("com.android.application")
     // START: FlutterFire Configuration
@@ -8,6 +11,12 @@ plugins {
     id("dev.flutter.flutter-gradle-plugin")
 }
 
+val keystoreProperties = Properties()
+val keystorePropertiesFile = rootProject.file("key.properties")
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+}
+
 android {
     namespace = "dev.solsynth.solian"
     compileSdk = flutter.compileSdkVersion
@@ -31,23 +40,28 @@ android {
     }
 
     signingConfigs {
-        release {
-            keyAlias = keystoreProperties['keyAlias']
-            keyPassword = keystoreProperties['keyPassword']
-            storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-            storePassword = keystoreProperties['storePassword']
+        create("release") {
+            keyAlias = keystoreProperties["keyAlias"] as String
+            keyPassword = keystoreProperties["keyPassword"] as String
+            storeFile = keystoreProperties["storeFile"]?.let { file(it) }
+            storePassword = keystoreProperties["storePassword"] as String
         }
     }
 
     buildTypes {
         release {
             signingConfig = signingConfigs.getByName("release")
-            minifyEnabled = true
-            shrinkResources = true
         }
     }
 }
 
+dependencies {
+    implementation("com.google.android.material:material:1.12.0")
+    implementation("com.github.bumptech.glide:glide:4.16.0")
+    implementation("com.squareup.okhttp3:okhttp:4.12.0")
+    implementation("com.google.firebase:firebase-messaging-ktx")
+}
+
 flutter {
     source = "../.."
 }

android/app/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTask"
             android:taskAffinity=""
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -41,6 +41,43 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            
+            <!-- Share Intent Filters -->
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="video/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="video/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/*" />
+            </intent-filter>
         </activity>
 
         <!-- Sign in with Apple -->
@@ -58,6 +95,19 @@
             </intent-filter>
         </activity>
 
+        <receiver
+            android:name=".receiver.ReplyReceiver"
+            android:enabled="true"
+            android:exported="false" />
+
+        <service
+            android:name=".service.MessagingService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="dev.solsynth.solian.provider"

android/app/src/main/kotlin/dev/solsynth/solian/network/ApiClient.kt

@@ -0,0 +1,48 @@
+package dev.solsynth.solian.network
+
+import android.content.Context
+import okhttp3.*
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.json.JSONObject
+import java.io.IOException
+
+class ApiClient(private val context: Context) {
+    private val client = OkHttpClient()
+
+    fun sendMessage(roomId: String, content: String, repliedMessageId: String, callback: () -> Unit) {
+        val prefs = context.getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE)
+        val token = prefs.getString("flutter.token", null)
+        val serverUrl = prefs.getString("flutter.serverUrl", null)
+
+        if (token == null || serverUrl == null) {
+            return
+        }
+
+        val url = "$serverUrl/chat/$roomId/messages"
+
+        val json = JSONObject()
+        json.put("content", content)
+        json.put("replied_message_id", repliedMessageId)
+
+        val requestBody = json.toString().toRequestBody("application/json; charset=utf-8".toMediaType())
+
+        val request = Request.Builder()
+            .url(url)
+            .post(requestBody)
+            .addHeader("Authorization", "AtField $token")
+            .build()
+
+        client.newCall(request).enqueue(object : Callback {
+            override fun onFailure(call: Call, e: IOException) {
+                // Handle failure
+                callback()
+            }
+
+            override fun onResponse(call: Call, response: Response) {
+                // Handle success
+                callback()
+            }
+        })
+    }
+}

android/app/src/main/kotlin/dev/solsynth/solian/receiver/ReplyReceiver.kt

@@ -0,0 +1,27 @@
+package dev.solsynth.solian.receiver
+
+import android.app.NotificationManager
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import androidx.core.app.RemoteInput
+import dev.solsynth.solian.network.ApiClient
+
+class ReplyReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        val remoteInput = RemoteInput.getResultsFromIntent(intent)
+        if (remoteInput != null) {
+            val replyText = remoteInput.getCharSequence("key_text_reply").toString()
+            val roomId = intent.getStringExtra("room_id")
+            val messageId = intent.getStringExtra("message_id")
+            val notificationId = intent.getIntExtra("notification_id", 0)
+
+            if (roomId != null && messageId != null) {
+                ApiClient(context).sendMessage(roomId, replyText, messageId) {
+                    val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+                    notificationManager.cancel(notificationId)
+                }
+            }
+        }
+    }
+}

android/app/src/main/kotlin/dev/solsynth/solian/service/MessagingService.kt

@@ -0,0 +1,101 @@
+package dev.solsynth.solian.service
+
+import android.app.PendingIntent
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.RemoteInput
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.target.CustomTarget
+import com.bumptech.glide.request.transition.Transition
+import com.google.firebase.messaging.FirebaseMessagingService
+import com.google.firebase.messaging.RemoteMessage
+import dev.solsynth.solian.MainActivity
+import dev.solsynth.solian.receiver.ReplyReceiver
+import org.json.JSONObject
+
+class MessagingService: FirebaseMessagingService() {
+    override fun onMessageReceived(remoteMessage: RemoteMessage) {
+        val type = remoteMessage.data["type"]
+        if (type == "messages.new") {
+            handleMessageNotification(remoteMessage)
+        } else {
+            // Handle other notification types
+        }
+    }
+
+    private fun handleMessageNotification(remoteMessage: RemoteMessage) {
+        val data = remoteMessage.data
+        val metaString = data["meta"] ?: return
+        val meta = JSONObject(metaString)
+
+        val pfp = meta.optString("pfp", null)
+        val roomId = meta.optString("room_id", null)
+        val messageId = meta.optString("message_id", null)
+
+        val notificationId = System.currentTimeMillis().toInt()
+
+        val replyLabel = "Reply"
+        val remoteInput = RemoteInput.Builder("key_text_reply")
+            .setLabel(replyLabel)
+            .build()
+
+        val replyIntent = Intent(this, ReplyReceiver::class.java).apply {
+            putExtra("room_id", roomId)
+            putExtra("message_id", messageId)
+            putExtra("notification_id", notificationId)
+        }
+
+        val pendingIntentFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        } else {
+            PendingIntent.FLAG_UPDATE_CURRENT
+        }
+
+        val replyPendingIntent = PendingIntent.getBroadcast(
+            applicationContext,
+            notificationId,
+            replyIntent,
+            pendingIntentFlags
+        )
+
+        val action = NotificationCompat.Action.Builder(
+            android.R.drawable.ic_menu_send,
+            replyLabel,
+            replyPendingIntent
+        )
+            .addRemoteInput(remoteInput)
+            .build()
+
+        val intent = Intent(this, MainActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        val pendingIntent = PendingIntent.getActivity(this, 0, intent, pendingIntentFlags)
+
+        val notificationBuilder = NotificationCompat.Builder(this, "messages")
+            .setSmallIcon(android.R.drawable.ic_dialog_info)
+            .setContentTitle(remoteMessage.notification?.title)
+            .setContentText(remoteMessage.notification?.body)
+            .setPriority(NotificationCompat.PRIORITY_HIGH)
+            .setContentIntent(pendingIntent)
+            .addAction(action)
+
+        if (pfp != null) {
+            Glide.with(applicationContext)
+                .asBitmap()
+                .load(pfp)
+                .into(object : CustomTarget<Bitmap>() {
+                    override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
+                        notificationBuilder.setLargeIcon(resource)
+                        NotificationManagerCompat.from(applicationContext).notify(notificationId, notificationBuilder.build())
+                    }
+
+                    override fun onLoadCleared(placeholder: Drawable?) {}
+                })
+        } else {
+            NotificationManagerCompat.from(this).notify(notificationId, notificationBuilder.build())
+        }
+    }
+}

android/app/src/main/res/values-night/styles.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <style name="LaunchTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
@@ -16,7 +16,7 @@
          running.
 
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
-    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <style name="NormalTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+    <style name="LaunchTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
@@ -16,7 +16,7 @@
          running.
 
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
-    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+    <style name="NormalTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
 </resources>

assets/i18n/en-US.json

@@ -48,6 +48,28 @@
   "deletePublisherHint": "Are you sure to delete this publisher? This will also deleted all the post and collections under this publisher.",
   "somethingWentWrong": "Something went wrong...",
   "deletePost": "Delete Post",
+  "safetyReport": "Report",
+  "safetyReportTitle": "Safety Report",
+  "safetyReportDescription": "Help us keep the community safe by reporting inappropriate content or behavior.",
+  "safetyReportType": "Report Type",
+  "safetyReportReason": "Additional Details",
+  "safetyReportReasonHint": "Please provide more details about the issue...",
+  "safetyReportSubmit": "Submit Report",
+  "safetyReportSubmitting": "Submitting...",
+  "safetyReportSuccess": "Report submitted successfully. Thank you for helping keep our community safe.",
+  "safetyReportError": "Failed to submit report. Please try again.",
+  "safetyReportReasonRequired": "Please provide details about the issue",
+  "safetyReportTypeSpam": "Spam or Misleading",
+  "safetyReportTypeHarassment": "Harassment or Abuse",
+  "safetyReportTypeHateSpeech": "Hate Speech",
+  "safetyReportTypeViolence": "Violence or Threats",
+  "safetyReportTypeAdultContent": "Adult Content",
+  "safetyReportTypeIntellectualProperty": "Intellectual Property Violation",
+  "safetyReportTypeOther": "Other",
+  "safetyReportTypeInappropriate": "Inappropriate Content",
+  "safetyReportTypeCopyright": "Copyright Violation",
+  "safetyReportSuccessTitle": "Report Submitted",
+  "safetyReportErrorTitle": "Error",
   "deletePostHint": "Are you sure to delete this post?",
   "copyLink": "Copy Link",
   "postCreateAccountTitle": "Thanks for joining!",
@@ -65,29 +87,16 @@
   "authFactorTOTPDescription": "A one-time code generated by a TOTP authenticator such as Google Authenticator or Authy.",
   "authFactorInAppNotify": "In-app notification",
   "authFactorInAppNotifyDescription": "A one-time code sent via in-app notification.",
-  "realms": "Realms",
-  "createRealm": "Create a Realm",
-  "createRealmHint": "Meet friends with same interests, build communities, and more.",
-  "editRealm": "Edit Realm",
-  "deleteRealm": "Delete Realm",
-  "deleteRealmHint": "Are you sure to delete this realm? This will also deleted all the channels, publishers, and posts under this realm.",
+  "authFactorPin": "Pin Code",
+  "authFactorPinDescription": "It consists of 6 digits. It cannot be used to log in. When performing some dangerous operations, the system will ask you to enter this PIN for confirmation.",
   "explore": "Explore",
+  "exploreFilterSubscriptions": "Subscriptions",
+  "exploreFilterFriends": "Friends",
+  "discover": "Discover",
   "account": "Account",
   "name": "Name",
-  "description": "Description",
   "slug": "Slug",
   "slugHint": "The slug will be used in the URL to access this resource, it should be unique and URL safe.",
-  "createChatRoom": "Create a Room",
-  "editChatRoom": "Edit Room",
-  "deleteChatRoom": "Delete Room",
-  "deleteChatRoomHint": "Are you sure to delete this room? This action cannot be undone.",
-  "chat": "Chat",
-  "chatTabAll": "All",
-  "chatTabDirect": "Direct Messages",
-  "chatTabGroup": "Group Chats",
-  "chatMessageHint": "Message in {}",
-  "chatDirectMessageHint": "Message to {}",
-  "directMessage": "Direct Message",
   "loading": "Loading...",
   "descriptionNone": "No description yet.",
   "invites": "Invites",
@@ -152,6 +161,7 @@
   "accountConnectionProviderGoogle": "Google",
   "accountConnectionProviderGithub": "GitHub",
   "accountConnectionProviderDiscord": "Discord",
+  "accountConnectionProviderAfdian": "Afdian",
   "checkIn": "Check In",
   "checkInNone": "Not checked-in yet",
   "checkInNoneHint": "Get your fortune tips and daily rewards by checking in.",
@@ -221,7 +231,6 @@
   "uploadingProgress": "Uploading {} of {}",
   "uploadAll": "Upload All",
   "stickerCopyPlaceholder": "Copy Placeholder",
-  "realmSelection": "Select a Realm",
   "individual": "Individual",
   "firstPostBadgeName": "First Post",
   "firstPostBadgeDescription": "Created your first post on Solar Network",
@@ -251,7 +260,7 @@
   "walletCurrencyPoints": "New Solar Points",
   "walletCurrencyShortPoints": "NSP",
   "walletCurrencyGolds": "The Solar Dollars",
-  "walletCurrencyShortGolds": "TSD",
+  "walletCurrencyShortGolds": "NSD",
   "retry": "Retry",
   "creatorHubUnselectedHint": "Pick / create a publisher to get started.",
   "relationships": "Relationships",
@@ -277,10 +286,6 @@
   "levelingProgressExperience": "{} EXP",
   "levelingProgressLevel": "Level {}",
   "fileUploadingProgress": "Uploading file #{}: {}%",
-  "removeChatMember": "Remove Chat Room Member",
-  "removeChatMemberHint": "Are you sure to remove this member from the room?",
-  "removeRealmMember": "Remove Realm Member",
-  "removeRealmMemberHint": "Are you sure to remove this member from the realm?",
   "memberRole": "Member Role",
   "memberRoleHint": "Greater number has higher permission.",
   "memberRoleEdit": "Edit role for @{}",
@@ -288,10 +293,6 @@
   "openLinkConfirmDescription": "You're going to leave the Solar Network and open the link ({}) in your browser. It is not related to Solar Network. Beware of phishing and scams.",
   "brokenLink": "Unable open link {}... It might be broken or missing uri parts...",
   "copyToClipboard": "Copy to clipboard",
-  "leaveChatRoom": "Leave Chat Room",
-  "leaveChatRoomHint": "Are you sure to leave this chat room?",
-  "leaveRealm": "Leave Realm",
-  "leaveRealmHint": "Are you sure to leave this realm?",
   "walletNotFound": "Wallet not found",
   "walletCreateHint": "You don't have a wallet yet. Create one to start using the Solar Network eWallet.",
   "walletCreate": "Create a Wallet",
@@ -303,12 +304,6 @@
   "settingsBackgroundImageClear": "Clear Background Image",
   "settingsBackgroundGenerateColor": "Generate color scheme from Bacground Image",
   "messageNone": "No content to display",
-  "unreadMessages": {
-    "one": "{} unread message",
-    "other": "{} unread messages"
-  },
-  "chatBreakNone": "None",
-  "settingsRealmCompactView": "Compact Realm View",
   "settingsMixedFeed": "Mixed Feed",
   "settingsAutoTranslate": "Auto Translate",
   "settingsHideBottomNav": "Hide Bottom Navigation",
@@ -350,7 +345,7 @@
   "postVisibilityFriends": "Friends Only",
   "postVisibilityUnlisted": "Unlisted",
   "postVisibilityPrivate": "Private",
-  "copyMessage": "Copy Message",
+  "postTruncated": "Content truncated, tap to view full post",
   "authFactor": "Authentication Factor",
   "authFactorDelete": "Delete the Factor",
   "authFactorDeleteHint": "Are you sure you want to delete this authentication factor? This action cannot be undone.",
@@ -383,10 +378,6 @@
   "authDeviceLabelHint": "Enter a name for this device",
   "authDeviceSwipeEditHint": "Swipe left to edit label",
   "authDeviceSwipeLogoutHint": "Swipe right to logout device",
-  "typingHint": {
-    "one": "{} is typing...",
-    "other": "{} are typing..."
-  },
   "settingsAppearance": "Appearance",
   "settingsServer": "Server",
   "settingsBehavior": "Behavior",
@@ -400,6 +391,27 @@
   "settingsKeyboardShortcutNewMessage": "New Message",
   "settingsKeyboardShortcutCloseDialog": "Close Dialog",
   "close": "Close",
+  "drafts": "Drafts",
+  "noDrafts": "No drafts yet",
+  "articleDrafts": "Article drafts",
+  "postDrafts": "Post drafts",
+  "saveDraft": "Save draft",
+  "draftSaved": "Draft saved",
+  "draftSaveFailed": "Failed to save draft",
+  "clearAllDrafts": "Clear All Drafts",
+  "clearAllDraftsConfirm": "Are you sure you want to delete all drafts? This action cannot be undone.",
+  "clearAll": "Clear All",
+  "untitled": "Untitled",
+  "noContent": "No content",
+  "justNow": "Just now",
+  "minutesAgo": "{} minutes ago",
+  "hoursAgo": "{} hours ago",
+  "daysAgo": "{} days ago",
+  "public": "Public",
+  "unlisted": "Unlisted",
+  "friends": "Friends",
+  "selected": "Selected",
+  "private": "Private",
   "contactMethod": "Contact Method",
   "contactMethodType": "Contact Type",
   "contactMethodTypeEmail": "Email",
@@ -417,6 +429,7 @@
   "contactMethodDelete": "Delete Contact",
   "contactMethodNew": "New Contact Method",
   "contactMethodContentEmpty": "Contact content cannot be empty",
+  "postContentEmpty": "Post content cannot be empty",
   "contactMethodVerificationSent": "Verification code sent to your contact method",
   "contactMethodVerificationNeeded": "The contact method is added, but not verified yet. You can verify it by tapping it and select verify.",
   "accountContactMethod": "Contact Methods",
@@ -426,21 +439,6 @@
   "contactMethodSetPrimary": "Set as Primary",
   "contactMethodSetPrimaryHint": "Set this contact method as your primary contact method for account recovery and notifications",
   "contactMethodDeleteHint": "Are you sure to delete this contact method? This action cannot be undone.",
-  "chatNotifyLevel": "Notify Level",
-  "chatNotifyLevelDescription": "Decide how many notifications you will receive.",
-  "chatNotifyLevelAll": "All",
-  "chatNotifyLevelMention": "Mentions",
-  "chatNotifyLevelNone": "None",
-  "chatNotifyLevelUpdated": "The notify level has been updated to {}.",
-  "chatBreak": "Take a Break",
-  "chatBreakDescription": "Set a time, before that time, your notification level will be metions only, to take a break of the current topic they're talking about.",
-  "chatBreakClear": "Clear the break time",
-  "chatBreakHour": "{} break",
-  "chatBreakDay": "{} day break",
-  "chatBreakSet": "Break set for {}",
-  "chatBreakCleared": "Chat break has been cleared.",
-  "chatBreakCustom": "Custom duration",
-  "chatBreakEnterMinutes": "Enter minutes",
   "firstName": "First Name",
   "middleName": "Middle Name",
   "lastName": "Last Name",
@@ -459,5 +457,112 @@
   "unspecified": "Unspecified",
   "added": "Added",
   "preview": "Preview",
-  "togglePreview": "Toggle Preview"
+  "togglePreview": "Toggle Preview",
+  "subscribe": "Subscribe",
+  "unsubscribe": "Unsubscribe",
+  "paymentVerification": "Payment Verification",
+  "paymentSummary": "Payment Summary",
+  "amount": "Amount",
+  "description": "Description",
+  "pinCode": "PIN Code",
+  "biometric": "Biometric",
+  "enterPinToConfirm": "Enter your 6-digit PIN to confirm payment",
+  "clearPin": "Clear PIN",
+  "useBiometricToConfirm": "Use biometric authentication to confirm payment",
+  "touchSensorToAuthenticate": "Touch the sensor to authenticate",
+  "authenticating": "Authenticating...",
+  "authenticateNow": "Authenticate Now",
+  "processing": "Processing...",
+  "processingPayment": "Processing Payment...",
+  "pleaseWait": "Please wait",
+  "paymentFailed": "Payment failed. Please try again.",
+  "invalidPin": "Invalid PIN. Please try again.",
+  "biometricAuthFailed": "Biometric authentication failed. Please try again.",
+  "paymentSuccess": "Payment completed successfully!",
+  "membershipPurchaseSuccess": "Membership purchased successfully!",
+  "paymentError": "Payment failed: {error}",
+  "usePinInstead": "Use PIN Code",
+  "levelProgress": "Level Progress",
+  "unlockedFeatures": "Unlocked Features",
+  "unlockedFeaturesDescription": "Features unlocked at your current level will be displayed here.",
+  "stellarMembership": "Stellar Membership",
+  "upgradeYourPlan": "Upgrade Your Plan",
+  "chooseYourPlan": "Choose Your Plan",
+  "currentMembership": "Current: {}",
+  "membershipExpires": "Expires: {}",
+  "membershipTierStellar": "Stellar",
+  "membershipTierNova": "Nova",
+  "membershipTierSupernova": "Supernova",
+  "membershipTierUnknown": "Unknown",
+  "membershipPriceStellar": "10 NS$ per month",
+  "membershipPriceNova": "20 NS$ per month",
+  "membershipPriceSupernova": "30 NS$ per month",
+  "membershipFeatureBasic": "Basic features",
+  "membershipFeaturePrioritySupport": "Priority support",
+  "membershipFeatureAdFree": "Ad-free experience",
+  "membershipFeatureAllPrimary": "All Primary features",
+  "membershipFeatureAdvancedCustomization": "Advanced customization",
+  "membershipFeatureEarlyAccess": "Early access",
+  "membershipFeatureAllNova": "All Nova features",
+  "membershipFeatureExclusiveContent": "Exclusive content",
+  "membershipFeatureVipSupport": "VIP support",
+  "membershipCurrentBadge": "CURRENT",
+  "restorePurchase": "Restore Purchase",
+  "restorePurchaseDescription": "Enter your payment provider and order ID to restore your purchase.",
+  "provider": "Provider",
+  "selectProvider": "Select a provider",
+  "orderId": "Order ID",
+  "enterOrderId": "Enter your order ID",
+  "restore": "Restore",
+  "keyboardShortcuts": "Keyboard Shortcuts",
+  "share": "Share",
+  "sharePost": "Share Post",
+  "quickActions": "Quick Actions",
+  "post": "Post",
+  "copy": "Copy",
+  "failedToShareToPost": "Failed to share to post: {}",
+  "shareToChatComingSoon": "Share to chat functionality coming soon",
+  "systemShareComingSoon": "System share functionality coming soon",
+  "failedToShareToSystem": "Failed to share to system: {}",
+  "failedToCopy": "Failed to copy: {}",
+  "contentToShare": "Content to share:",
+  "uploadingFiles": "Uploading files...",
+  "shareSuccess": "Shared successfully!",
+  "wouldYouLikeToGoToChat": "Would you like to go to the chat?",
+  "no": "No",
+  "yes": "Yes",
+  "abuseReport": "Report",
+  "abuseReportTitle": "Report Content",
+  "abuseReportDescription": "Help us keep the community safe by reporting inappropriate content or behavior.",
+  "abuseReportType": "Report Type",
+  "abuseReportReason": "Additional Details",
+  "abuseReportReasonHint": "Please provide more details about the issue...",
+  "abuseReportSubmit": "Submit Report",
+  "abuseReportSuccess": "Report submitted successfully. Thank you for helping keep our community safe.",
+  "abuseReportError": "Failed to submit report. Please try again.",
+  "abuseReportReasonRequired": "Please provide details about the issue",
+  "abuseReportSuccessTitle": "Report Submitted",
+  "abuseReportErrorTitle": "Error",
+  "abuseReportTypeSpam": "Spam or Misleading",
+  "abuseReportTypeHarassment": "Harassment or Abuse",
+  "abuseReportTypeInappropriate": "Inappropriate Content",
+  "abuseReportTypeViolence": "Violence or Threats",
+  "abuseReportTypeCopyright": "Copyright Violation",
+  "abuseReportTypeImpersonation": "Impersonation",
+  "abuseReportTypeOffensiveContent": "Offensive Content",
+  "abuseReportTypePrivacyViolation": "Privacy Violation",
+  "abuseReportTypeIllegalContent": "Illegal Content",
+  "abuseReportTypeOther": "Other",
+  "tags": "Tags",
+  "tagsHint": "Enter tags, separated by commas",
+  "categories": "Categories",
+  "categoriesHint": "Enter categories, separated by commas",
+  "chatNotJoined": "You have not joined this chat yet.",
+  "chatUnableJoin": "You can't join this chat due to it's access control settings.",
+  "chatJoin": "Join the Chat",
+  "realmJoin": "Join the Realm",
+  "realmJoinSuccess": "Successfully joined the realm.",
+  "discoverRealms": "Discover Realms",
+  "discoverPublishers": "Discover Publishers",
+  "search": "Search"
 }

assets/i18n/zh-CN.json

@@ -292,6 +292,7 @@
   "postVisibilityFriends": "仅好友可见",
   "postVisibilityUnlisted": "不公开",
   "postVisibilityPrivate": "私密",
+  "postTruncated": "内容已截断，点击查看完整帖子",
   "chatNotifyLevel": "通知级别",
   "chatNotifyLevelDescription": "决定您将收到多少通知。",
   "chatNotifyLevelAll": "全部",
@@ -312,5 +313,44 @@
   "checkInResultT1": "凶",
   "checkInResultT2": "中平",
   "checkInResultT3": "吉",
-  "checkInResultT4": "大吉"
+  "checkInResultT4": "大吉",
+  "authenticating": "认证中...",
+  "processing": "处理中...",
+  "processingPayment": "处理付款中...",
+  "pleaseWait": "请稍候",
+  "paymentFailed": "付款失败，请重试。",
+  "paymentSuccess": "付款成功完成！",
+  "drafts": "草稿",
+  "noDrafts": "暂无草稿",
+  "articleDrafts": "文章草稿",
+  "postDrafts": "帖子草稿",
+  "saveDraft": "保存草稿",
+  "draftSaved": "草稿已保存",
+  "draftSaveFailed": "保存草稿失败",
+  "clearAllDrafts": "清空所有草稿",
+  "clearAllDraftsConfirm": "确定要删除所有草稿吗？此操作无法撤销。",
+  "clearAll": "清空全部",
+  "untitled": "无标题",
+  "noContent": "无内容",
+  "justNow": "刚刚",
+  "minutesAgo": "{} 分钟前",
+  "hoursAgo": "{} 小时前",
+  "postContentEmpty": "帖子内容不能为空",
+  "share": "分享",
+  "quickActions": "快捷操作",
+  "post": "帖子",
+  "copy": "复制",
+  "sendToChat": "发送到聊天",
+  "failedToShareToPost": "分享到帖子失败：{}",
+  "shareToChatComingSoon": "聊天分享功能即将推出",
+  "failedToShareToChat": "分享到聊天失败：{}",
+  "shareToSpecificChatComingSoon": "分享到 {} 即将推出",
+  "directChat": "私聊",
+  "systemShareComingSoon": "系统分享功能即将推出",
+  "failedToShareToSystem": "系统分享失败：{}",
+  "copiedToClipboard": "已复制到剪贴板",
+  "failedToCopy": "复制失败：{}",
+  "noChatRoomsAvailable": "没有可用的聊天室",
+  "failedToLoadChats": "加载聊天失败",
+  "unknownChat": "未知聊天"
 }

assets/i18n/zh-TW.json

@@ -307,5 +307,65 @@
   "chatBreakCleared": "聊天暫停已清除。",
   "chatBreakCustom": "自訂時長",
   "chatBreakEnterMinutes": "輸入分鐘數",
-  "chatBreakNone": "無"
+  "chatBreakNone": "無",
+  "paymentError": "付款失敗：{error}",
+  "usePinInstead": "使用密碼",
+  "levelProgress": "等級進度",
+  "unlockedFeatures": "已解鎖功能",
+  "unlockedFeaturesDescription": "您目前等級解鎖的功能將會顯示在此。",
+  "stellarMembership": "星際會員",
+  "upgradeYourPlan": "升級您的方案",
+  "chooseYourPlan": "選擇您的方案",
+  "currentMembership": "目前：{}",
+  "membershipExpires": "到期：{}",
+  "membershipTierStellar": "星際",
+  "membershipTierNova": "新星",
+  "membershipTierSupernova": "超新星",
+  "membershipTierUnknown": "未知",
+  "membershipPriceStellar": "每月 10 星幣",
+  "membershipPriceNova": "每月 20 星幣",
+  "membershipPriceSupernova": "每月 30 星幣",
+  "membershipFeatureBasic": "基本功能",
+  "membershipFeaturePrioritySupport": "優先支援",
+  "membershipFeatureAdFree": "無廣告體驗",
+  "membershipFeatureAllPrimary": "所有主要功能",
+  "membershipFeatureAdvancedCustomization": "進階自訂",
+  "membershipFeatureEarlyAccess": "搶先體驗",
+  "membershipFeatureAllNova": "所有新星功能",
+  "membershipFeatureExclusiveContent": "獨家內容",
+  "membershipFeatureVipSupport": "VIP 支援",
+  "membershipCurrentBadge": "目前",
+  "drafts": "草稿",
+  "noDrafts": "暫無草稿",
+  "articleDrafts": "文章草稿",
+  "postDrafts": "貼文草稿",
+  "saveDraft": "儲存草稿",
+  "draftSaved": "草稿已儲存",
+  "draftSaveFailed": "儲存草稿失敗",
+  "clearAllDrafts": "清空所有草稿",
+  "clearAllDraftsConfirm": "確定要刪除所有草稿嗎？此操作無法復原。",
+  "clearAll": "清空全部",
+  "untitled": "無標題",
+  "noContent": "無內容",
+  "justNow": "剛剛",
+  "minutesAgo": "{} 分鐘前",
+  "hoursAgo": "{} 小時前",
+  "postContentEmpty": "貼文內容不能為空",
+  "share": "分享",
+  "quickActions": "快速操作",
+  "post": "貼文",
+  "copy": "複製",
+  "sendToChat": "傳送到聊天",
+  "failedToShareToPost": "分享到貼文失敗：{}",
+  "shareToChatComingSoon": "聊天分享功能即將推出",
+  "failedToShareToChat": "分享到聊天失敗：{}",
+  "shareToSpecificChatComingSoon": "分享到 {} 即將推出",
+  "directChat": "私人聊天",
+  "systemShareComingSoon": "系統分享功能即將推出",
+  "failedToShareToSystem": "系統分享失敗：{}",
+  "copiedToClipboard": "已複製到剪貼簿",
+  "failedToCopy": "複製失敗：{}",
+  "noChatRoomsAvailable": "沒有可用的聊天室",
+  "failedToLoadChats": "載入聊天失敗",
+  "unknownChat": "未知聊天"
 }

assets/images/oidc/afdian.svg

@@ -0,0 +1,10 @@
+  <svg
+    viewBox="0 0 160 160"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      fill-rule="evenodd"
+      d="M134.614 98.3714C133.294 97.5334 131.909 97.1697 130.563 97.02C133.724 89.3002 135.736 79.1949 128.887 69.1574C118.406 53.7998 103.38 45.8198 84.2346 45.4382C78.7809 45.3312 72.3517 45.5844 65.5487 45.8554C57.6493 46.1692 47.1369 46.5793 39.9921 45.9873C41.4161 45.2136 42.9326 44.4719 44.2462 43.8336C49.2728 41.384 53.2314 39.4763 51.9214 36.0925C51.2343 34.117 49.1874 33.0794 45.8233 33.0045C38.7426 32.8441 23.4421 36.9447 20.6903 43.8586C19.1418 47.7524 18.8854 55.2689 34.5668 61.9119C41.0174 64.6503 59.237 67.9879 66.2678 68.6867C68.2542 68.8793 69.7743 69.2822 70.9277 69.7101C69.3151 70.7727 67.6597 71.8888 65.9972 73.0298C63.1102 71.3824 58.3897 69.4391 54.8654 71.846C53.502 72.7695 52.7259 74.1316 52.6903 75.6827C52.6405 77.6117 53.8081 79.498 55.1217 81.017C49.9314 85.1639 45.7343 89.1825 44.2462 92.2811C42.5873 96.0893 41.9109 102.322 45.008 108.402C48.9382 116.118 57.6279 121.499 70.8423 124.394C88.1114 128.17 103.027 124.768 112.895 119.566C118.388 116.671 122.286 113.215 124.18 110.131C124.768 110.317 125.355 110.506 125.96 110.695C126.804 110.951 127.648 111.208 128.438 111.49C131.051 112.395 133.942 112.274 136.167 111.151C136.206 111.133 136.248 111.108 136.291 111.087C137.968 110.202 139.175 108.783 139.705 107.072C141.129 102.458 137.064 99.9082 134.614 98.3714ZM64.9999 90.6681C63.4307 90.6681 62.1621 91.9382 62.1621 93.5091C62.1621 95.0836 63.4307 96.3537 64.9999 96.3537C66.5691 96.3537 67.8378 95.0836 67.8378 93.5091C67.8378 91.9382 66.5691 90.6681 64.9999 90.6681ZM91.7568 99.1965C90.1876 99.1965 88.9189 100.467 88.9189 102.038C88.9189 103.612 90.1876 104.882 91.7568 104.882C93.326 104.882 94.5946 103.612 94.5946 102.038C94.5946 100.467 93.326 99.1965 91.7568 99.1965Z"
+      fill="currentColor"
+    />
+  </svg>

crowdin.yml

@@ -0,0 +1,2 @@
+bundles:
+  - 6

ios/Podfile

@@ -44,6 +44,10 @@ target 'Runner' do
     pod 'Kingfisher', '~> 8.0'
     pod 'Alamofire'
   end
+
+  target 'SolianShareExtension' do
+    inherit! :search_paths
+  end
 end
 
 post_install do |installer|

ios/Podfile.lock

@@ -84,6 +84,8 @@ PODS:
     - Flutter
   - flutter_platform_alert (0.0.1):
     - Flutter
+  - flutter_secure_storage (6.0.0):
+    - Flutter
   - flutter_timezone (0.0.1):
     - Flutter
   - flutter_udid (0.0.1):
@@ -131,6 +133,9 @@ PODS:
     - Flutter
     - flutter_webrtc
     - WebRTC-SDK (= 125.6422.07)
+  - local_auth_darwin (0.0.1):
+    - Flutter
+    - FlutterMacOS
   - media_kit_libs_ios_video (1.0.4):
     - Flutter
   - media_kit_video (0.0.1):
@@ -151,12 +156,16 @@ PODS:
     - Flutter
     - FlutterMacOS
   - PromisesObjC (2.4.0)
+  - receive_sharing_intent (1.8.1):
+    - Flutter
   - record_ios (1.0.0):
     - Flutter
   - SAMKeychain (1.5.3)
   - SDWebImage (5.21.1):
     - SDWebImage/Core (= 5.21.1)
   - SDWebImage/Core (5.21.1)
+  - share_plus (0.0.1):
+    - Flutter
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -210,6 +219,7 @@ DEPENDENCIES:
   - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - flutter_platform_alert (from `.symlinks/plugins/flutter_platform_alert/ios`)
+  - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
   - flutter_timezone (from `.symlinks/plugins/flutter_timezone/ios`)
   - flutter_udid (from `.symlinks/plugins/flutter_udid/ios`)
   - flutter_webrtc (from `.symlinks/plugins/flutter_webrtc/ios`)
@@ -218,13 +228,16 @@ DEPENDENCIES:
   - irondash_engine_context (from `.symlinks/plugins/irondash_engine_context/ios`)
   - Kingfisher (~> 8.0)
   - livekit_client (from `.symlinks/plugins/livekit_client/ios`)
+  - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
   - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
   - media_kit_video (from `.symlinks/plugins/media_kit_video/ios`)
   - native_exif (from `.symlinks/plugins/native_exif/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - pasteboard (from `.symlinks/plugins/pasteboard/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
+  - receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`)
   - record_ios (from `.symlinks/plugins/record_ios/ios`)
+  - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sign_in_with_apple (from `.symlinks/plugins/sign_in_with_apple/ios`)
   - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
@@ -277,6 +290,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_native_splash/ios"
   flutter_platform_alert:
     :path: ".symlinks/plugins/flutter_platform_alert/ios"
+  flutter_secure_storage:
+    :path: ".symlinks/plugins/flutter_secure_storage/ios"
   flutter_timezone:
     :path: ".symlinks/plugins/flutter_timezone/ios"
   flutter_udid:
@@ -291,6 +306,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/irondash_engine_context/ios"
   livekit_client:
     :path: ".symlinks/plugins/livekit_client/ios"
+  local_auth_darwin:
+    :path: ".symlinks/plugins/local_auth_darwin/darwin"
   media_kit_libs_ios_video:
     :path: ".symlinks/plugins/media_kit_libs_ios_video/ios"
   media_kit_video:
@@ -303,8 +320,12 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/pasteboard/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
+  receive_sharing_intent:
+    :path: ".symlinks/plugins/receive_sharing_intent/ios"
   record_ios:
     :path: ".symlinks/plugins/record_ios/ios"
+  share_plus:
+    :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   sign_in_with_apple:
@@ -341,6 +362,7 @@ SPEC CHECKSUMS:
   flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
   flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
   flutter_platform_alert: bf3b5fcd4ac14bd637e20527e9c471633071afd3
+  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
   flutter_timezone: 7c838e17ffd4645d261e87037e5bebf6d38fe544
   flutter_udid: f7c3884e6ec2951efe4f9de082257fc77c4d15e9
   flutter_webrtc: fd0d3bdef8766a0736dbbe2e5b7e85f1f3c52117
@@ -351,6 +373,7 @@ SPEC CHECKSUMS:
   irondash_engine_context: 8e58ca8e0212ee9d1c7dc6a42121849986c88486
   Kingfisher: 0621d0ac0c78fecb19f6dc5303bde2b52abaf2f5
   livekit_client: 9e901890552514206e5ff828903ed271531da264
+  local_auth_darwin: 553ce4f9b16d3fdfeafce9cf042e7c9f77c1c391
   media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
   media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
@@ -360,9 +383,11 @@ SPEC CHECKSUMS:
   pasteboard: 49088aeb6119d51f976a421db60d8e1ab079b63c
   path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
+  receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00
   record_ios: fee1c924aa4879b882ebca2b4bce6011bcfc3d8b
   SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
   SDWebImage: f29024626962457f3470184232766516dee8dfea
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
   shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
   sign_in_with_apple: c5dcc141574c8c54d5ac99dd2163c0c72ad22418
   sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
@@ -375,6 +400,6 @@ SPEC CHECKSUMS:
   wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
   WebRTC-SDK: dff00a3892bc570b6014e046297782084071657e
 
-PODFILE CHECKSUM: 0c13198c20d0416ef589aeb2e1dac5c50262254f
+PODFILE CHECKSUM: f6df17c2a0cbd7af89692fd3877231eaea40230f
 
 COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

@@ -10,6 +10,7 @@
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		73C305D82E0BE878009035B9 /* SolianShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 73C305CE2E0BE878009035B9 /* SolianShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		73CDD6812DEC00480059D95D /* SolianNotificationService.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 73CDD67A2DEC00480059D95D /* SolianNotificationService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		73D4264B2DEB815D006C0AAE /* NotifyDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73D4264A2DEB815D006C0AAE /* NotifyDelegate.swift */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
@@ -18,6 +19,7 @@
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
 		B87C0E607033790E71B54D73 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6D834CA86410B09796B312B /* Pods_Runner.framework */; };
+		D174D53FF3E8EA943491A5CC /* Pods_SolianShareExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B40764A2C4CC0E7DC70A0D3 /* Pods_SolianShareExtension.framework */; };
 		D1772CE196985AE8E8C9F2E5 /* Pods_SolianNotificationService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 39FE4CC6223F0D3C0E1FFD04 /* Pods_SolianNotificationService.framework */; };
 		E7A0B456EF7AAA71D1397081 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9AE244813FCDFAA941430393 /* GoogleService-Info.plist */; };
 /* End PBXBuildFile section */
@@ -30,6 +32,13 @@
 			remoteGlobalIDString = 97C146ED1CF9000F007C117D;
 			remoteInfo = Runner;
 		};
+		73C305D62E0BE878009035B9 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 97C146E61CF9000F007C117D /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 73C305CD2E0BE878009035B9;
+			remoteInfo = SolianShareExtension;
+		};
 		73CDD67F2DEC00480059D95D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 97C146E61CF9000F007C117D /* Project object */;
@@ -46,6 +55,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 13;
 			files = (
+				73C305D82E0BE878009035B9 /* SolianShareExtension.appex in Embed Foundation Extensions */,
 				73CDD6812DEC00480059D95D /* SolianNotificationService.appex in Embed Foundation Extensions */,
 			);
 			name = "Embed Foundation Extensions";
@@ -68,9 +78,11 @@
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
 		14DFD79BE7C26E51B117583C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
+		17FAB080A9C53193ABD9C15B /* Pods-SolianShareExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SolianShareExtension.debug.xcconfig"; path = "Target Support Files/Pods-SolianShareExtension/Pods-SolianShareExtension.debug.xcconfig"; sourceTree = "<group>"; };
 		192FDACE67D7CB6AED15C634 /* Pods-NotificationService.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationService.debug.xcconfig"; path = "Target Support Files/Pods-NotificationService/Pods-NotificationService.debug.xcconfig"; sourceTree = "<group>"; };
 		1C14F71D23E4371602065522 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		252A83CE6862573BB856ED8E /* Pods-NotificationService.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationService.release.xcconfig"; path = "Target Support Files/Pods-NotificationService/Pods-NotificationService.release.xcconfig"; sourceTree = "<group>"; };
+		27C66EFB5A705F1A822C3EB0 /* Pods-SolianShareExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SolianShareExtension.release.xcconfig"; path = "Target Support Files/Pods-SolianShareExtension/Pods-SolianShareExtension.release.xcconfig"; sourceTree = "<group>"; };
 		29812C17FFBE7DBBC7203981 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		2D2457F8B2E6EF9C0F935035 /* Pods-NotificationService.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationService.profile.xcconfig"; path = "Target Support Files/Pods-NotificationService/Pods-NotificationService.profile.xcconfig"; sourceTree = "<group>"; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
@@ -79,11 +91,13 @@
 		3A1C47BD29CC6AC2587D4DBE /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		737E920B2DB6A9FF00BE9CDB /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
+		73C305CE2E0BE878009035B9 /* SolianShareExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = SolianShareExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		73CDD67A2DEC00480059D95D /* SolianNotificationService.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = SolianNotificationService.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		73D4264A2DEB815D006C0AAE /* NotifyDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotifyDelegate.swift; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		7B40764A2C4CC0E7DC70A0D3 /* Pods_SolianShareExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SolianShareExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		8B40620B1EEBB09456406A3C /* Pods-SolianNotificationService.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SolianNotificationService.profile.xcconfig"; path = "Target Support Files/Pods-SolianNotificationService/Pods-SolianNotificationService.profile.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
@@ -94,6 +108,7 @@
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		9AE244813FCDFAA941430393 /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
 		A499FDB2082EB000933AA8C5 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		A85FF612AE7623A9934E57CE /* Pods-SolianShareExtension.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SolianShareExtension.profile.xcconfig"; path = "Target Support Files/Pods-SolianShareExtension/Pods-SolianShareExtension.profile.xcconfig"; sourceTree = "<group>"; };
 		AA0CA8A3E15DEE023BB27438 /* Pods_NotificationService.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NotificationService.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B93771F2A63E4148DC6142F7 /* Pods-SolianNotificationService.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SolianNotificationService.release.xcconfig"; path = "Target Support Files/Pods-SolianNotificationService/Pods-SolianNotificationService.release.xcconfig"; sourceTree = "<group>"; };
 		E6B10A9A85BECA2E576C91FF /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
@@ -102,6 +117,13 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
+		73C305DC2E0BE878009035B9 /* Exceptions for "SolianShareExtension" folder in "SolianShareExtension" target */ = {
+			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
+			membershipExceptions = (
+				Info.plist,
+			);
+			target = 73C305CD2E0BE878009035B9 /* SolianShareExtension */;
+		};
 		73CDD6822DEC00480059D95D /* Exceptions for "SolianNotificationService" folder in "SolianNotificationService" target */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
@@ -128,6 +150,14 @@
 			path = Services;
 			sourceTree = "<group>";
 		};
+		73C305CF2E0BE878009035B9 /* SolianShareExtension */ = {
+			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+				73C305DC2E0BE878009035B9 /* Exceptions for "SolianShareExtension" folder in "SolianShareExtension" target */,
+			);
+			path = SolianShareExtension;
+			sourceTree = "<group>";
+		};
 		73CDD67B2DEC00480059D95D /* SolianNotificationService */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
 			exceptions = (
@@ -147,6 +177,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		73C305CB2E0BE878009035B9 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D174D53FF3E8EA943491A5CC /* Pods_SolianShareExtension.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		73CDD6772DEC00480059D95D /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -181,6 +219,7 @@
 				29812C17FFBE7DBBC7203981 /* Pods_RunnerTests.framework */,
 				AA0CA8A3E15DEE023BB27438 /* Pods_NotificationService.framework */,
 				39FE4CC6223F0D3C0E1FFD04 /* Pods_SolianNotificationService.framework */,
+				7B40764A2C4CC0E7DC70A0D3 /* Pods_SolianShareExtension.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -200,6 +239,9 @@
 				F830F535CB92E3F2E1653A11 /* Pods-SolianNotificationService.debug.xcconfig */,
 				B93771F2A63E4148DC6142F7 /* Pods-SolianNotificationService.release.xcconfig */,
 				8B40620B1EEBB09456406A3C /* Pods-SolianNotificationService.profile.xcconfig */,
+				17FAB080A9C53193ABD9C15B /* Pods-SolianShareExtension.debug.xcconfig */,
+				27C66EFB5A705F1A822C3EB0 /* Pods-SolianShareExtension.release.xcconfig */,
+				A85FF612AE7623A9934E57CE /* Pods-SolianShareExtension.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -221,6 +263,7 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				73CDD67B2DEC00480059D95D /* SolianNotificationService */,
+				73C305CF2E0BE878009035B9 /* SolianShareExtension */,
 				97C146EF1CF9000F007C117D /* Products */,
 				331C8082294A63A400263BE5 /* RunnerTests */,
 				91E124CE95BCB4DCD890160D /* Pods */,
@@ -235,6 +278,7 @@
 				97C146EE1CF9000F007C117D /* Runner.app */,
 				331C8081294A63A400263BE5 /* RunnerTests.xctest */,
 				73CDD67A2DEC00480059D95D /* SolianNotificationService.appex */,
+				73C305CE2E0BE878009035B9 /* SolianShareExtension.appex */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -279,6 +323,27 @@
 			productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
+		73C305CD2E0BE878009035B9 /* SolianShareExtension */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 73C305DD2E0BE878009035B9 /* Build configuration list for PBXNativeTarget "SolianShareExtension" */;
+			buildPhases = (
+				67E069E457308C73A1C44EF4 /* [CP] Check Pods Manifest.lock */,
+				73C305CA2E0BE878009035B9 /* Sources */,
+				73C305CB2E0BE878009035B9 /* Frameworks */,
+				73C305CC2E0BE878009035B9 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			fileSystemSynchronizedGroups = (
+				73C305CF2E0BE878009035B9 /* SolianShareExtension */,
+			);
+			name = SolianShareExtension;
+			productName = SolianShareExtension;
+			productReference = 73C305CE2E0BE878009035B9 /* SolianShareExtension.appex */;
+			productType = "com.apple.product-type.app-extension";
+		};
 		73CDD6792DEC00480059D95D /* SolianNotificationService */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 73CDD6832DEC00480059D95D /* Build configuration list for PBXNativeTarget "SolianNotificationService" */;
@@ -319,6 +384,7 @@
 			);
 			dependencies = (
 				73CDD6802DEC00480059D95D /* PBXTargetDependency */,
+				73C305D72E0BE878009035B9 /* PBXTargetDependency */,
 			);
 			fileSystemSynchronizedGroups = (
 				73268D272DEB012A0076E970 /* Services */,
@@ -343,6 +409,9 @@
 						CreatedOnToolsVersion = 14.0;
 						TestTargetID = 97C146ED1CF9000F007C117D;
 					};
+					73C305CD2E0BE878009035B9 = {
+						CreatedOnToolsVersion = 16.4;
+					};
 					73CDD6792DEC00480059D95D = {
 						CreatedOnToolsVersion = 16.4;
 					};
@@ -368,6 +437,7 @@
 				97C146ED1CF9000F007C117D /* Runner */,
 				331C8080294A63A400263BE5 /* RunnerTests */,
 				73CDD6792DEC00480059D95D /* SolianNotificationService */,
+				73C305CD2E0BE878009035B9 /* SolianShareExtension */,
 			);
 		};
 /* End PBXProject section */
@@ -380,6 +450,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		73C305CC2E0BE878009035B9 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		73CDD6782DEC00480059D95D /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -479,6 +556,28 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		67E069E457308C73A1C44EF4 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-SolianShareExtension-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 		8C0351B03869BBF493808288 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -544,6 +643,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		73C305CA2E0BE878009035B9 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		73CDD6762DEC00480059D95D /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -569,6 +675,11 @@
 			target = 97C146ED1CF9000F007C117D /* Runner */;
 			targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */;
 		};
+		73C305D72E0BE878009035B9 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 73C305CD2E0BE878009035B9 /* SolianShareExtension */;
+			targetProxy = 73C305D62E0BE878009035B9 /* PBXContainerItemProxy */;
+		};
 		73CDD6802DEC00480059D95D /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 73CDD6792DEC00480059D95D /* SolianNotificationService */;
@@ -656,6 +767,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CUSTOM_GROUP_ID = group.solsynth.solian;
 				DEVELOPMENT_TEAM = W7HPZ53V6B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -723,6 +835,129 @@
 			};
 			name = Profile;
 		};
+		73C305D92E0BE878009035B9 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 17FAB080A9C53193ABD9C15B /* Pods-SolianShareExtension.debug.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = SolianShareExtension/SolianShareExtension.entitlements;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				CUSTOM_GROUP_ID = group.solsynth.solian;
+				DEVELOPMENT_TEAM = W7HPZ53V6B;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = SolianShareExtension/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = SolianShareExtension;
+				INFOPLIST_KEY_NSHumanReadableCopyright = "";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MARKETING_VERSION = 1.0;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian.SolianShareExtension;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		73C305DA2E0BE878009035B9 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 27C66EFB5A705F1A822C3EB0 /* Pods-SolianShareExtension.release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = SolianShareExtension/SolianShareExtension.entitlements;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				CUSTOM_GROUP_ID = group.solsynth.solian;
+				DEVELOPMENT_TEAM = W7HPZ53V6B;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = SolianShareExtension/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = SolianShareExtension;
+				INFOPLIST_KEY_NSHumanReadableCopyright = "";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MARKETING_VERSION = 1.0;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian.SolianShareExtension;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
+		73C305DB2E0BE878009035B9 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = A85FF612AE7623A9934E57CE /* Pods-SolianShareExtension.profile.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = SolianShareExtension/SolianShareExtension.entitlements;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				CUSTOM_GROUP_ID = group.solsynth.solian;
+				DEVELOPMENT_TEAM = W7HPZ53V6B;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = SolianShareExtension/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = SolianShareExtension;
+				INFOPLIST_KEY_NSHumanReadableCopyright = "";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MARKETING_VERSION = 1.0;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian.SolianShareExtension;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Profile;
+		};
 		73CDD6842DEC00480059D95D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F830F535CB92E3F2E1653A11 /* Pods-SolianNotificationService.debug.xcconfig */;
@@ -734,6 +969,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = SolianNotificationService/SolianNotificationService.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = W7HPZ53V6B;
@@ -743,7 +979,7 @@
 				INFOPLIST_FILE = SolianNotificationService/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = SolianNotificationService;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 18.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -775,6 +1011,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = SolianNotificationService/SolianNotificationService.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = W7HPZ53V6B;
@@ -784,7 +1021,7 @@
 				INFOPLIST_FILE = SolianNotificationService/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = SolianNotificationService;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 18.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -813,6 +1050,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = SolianNotificationService/SolianNotificationService.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = W7HPZ53V6B;
@@ -822,7 +1060,7 @@
 				INFOPLIST_FILE = SolianNotificationService/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = SolianNotificationService;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 18.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -959,6 +1197,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CUSTOM_GROUP_ID = group.solsynth.solian;
 				DEVELOPMENT_TEAM = W7HPZ53V6B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -985,6 +1224,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CUSTOM_GROUP_ID = group.solsynth.solian;
 				DEVELOPMENT_TEAM = W7HPZ53V6B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -1015,6 +1255,16 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		73C305DD2E0BE878009035B9 /* Build configuration list for PBXNativeTarget "SolianShareExtension" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				73C305D92E0BE878009035B9 /* Debug */,
+				73C305DA2E0BE878009035B9 /* Release */,
+				73C305DB2E0BE878009035B9 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		73CDD6832DEC00480059D95D /* Build configuration list for PBXNativeTarget "SolianNotificationService" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

ios/Runner/AppDelegate.swift

@@ -11,6 +11,21 @@ import UIKit
     ) -> Bool {
         UNUserNotificationCenter.current().delegate = notifyDelegate
         
+        let replyableMessageCategory = UNNotificationCategory(
+            identifier: "REPLYABLE_MESSAGE",
+            actions: [
+                UNTextInputNotificationAction(
+                    identifier: "reply_action",
+                    title: "Reply",
+                    options: []
+                ),
+            ],
+            intentIdentifiers: [],
+            options: []
+        )
+        
+        UNUserNotificationCenter.current().setNotificationCategories([replyableMessageCategory])
+        
         GeneratedPluginRegistrant.register(with: self)
         return super.application(application, didFinishLaunchingWithOptions: launchOptions)
     }

ios/Runner/Info.plist

@@ -34,6 +34,17 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+    <key>CFBundleURLTypes</key>
+    <array>
+        <dict>
+            <key>CFBundleTypeRole</key>
+            <string>Editor</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+                <string>ShareMedia-$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+            </array>
+        </dict>
+    </array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCalendarsUsageDescription</key>
@@ -74,6 +85,10 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>NSFaceIDUsageDescription</key>
+	<string>Allow the Solar Network verify your ownership of the logged in account and continue your action quickly.</string>
+	<key>AppGroupId</key>
+	<string>$(CUSTOM_GROUP_ID)</string>
 	<key>NSUserActivityTypes</key>
 	<array>
 		<string>INStartCallIntent</string>

ios/Runner/NotifyDelegate.swift

@@ -10,40 +10,51 @@ import Alamofire
 
 class NotifyDelegate: UIResponder, UNUserNotificationCenterDelegate {
     func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
-        if let textResponse = response as? UNTextInputNotificationResponse {
-            let content = response.notification.request.content
-            guard let metadata = content.userInfo["meta"] as? [AnyHashable: Any] else {
-                return
-            }
-            
-            var token: String? = UserDefaults.standard.getFlutterToken()
-            if token == nil {
-                return
-            }
-            
-            let serverUrl = UserDefaults.standard.getServerUrl()
-            let url = "\(serverUrl)/chat/\(metadata["room_id"] ?? "")/messages"
-            
-            let parameters: [String: Any?] = [
-                "content": textResponse.userText,
-                "replied_message_id": metadata["message_id"]
-            ]
-            
-            AF.request(url, method: .post, parameters: parameters, encoding: JSONEncoding.default, headers: HTTPHeaders(
-                [HTTPHeader(name: "Authorization", value: "AtField \(token!)")]
-            ))
-                .validate()
-                .responseString { response in
-                    switch response.result {
-                    case .success(_):
-                        break
-                    case .failure(let error):
-                        print("Failed to send chat reply message: \(error)")
-                        break
-                    }
-                }
+        guard let textResponse = response as? UNTextInputNotificationResponse else {
+            completionHandler()
+            return
         }
 
-        completionHandler()
+        let content = response.notification.request.content
+        
+        // Only handle replies for new messages
+        guard let notificationType = content.userInfo["type"] as? String, notificationType == "messages.new" else {
+            completionHandler()
+            return
+        }
+
+        guard let metadata = content.userInfo["meta"] as? [AnyHashable: Any] else {
+            completionHandler()
+            return
+        }
+        
+        guard let token = UserDefaults.standard.getFlutterToken() else {
+            completionHandler()
+            return
+        }
+        
+        let serverUrl = UserDefaults.standard.getServerUrl()
+        let url = "\(serverUrl)/chat/\(metadata["room_id"] ?? "")/messages"
+        
+        let parameters: [String: Any?] = [
+            "content": textResponse.userText,
+            "replied_message_id": metadata["message_id"]
+        ]
+        
+        AF.request(url, method: .post, parameters: parameters, encoding: JSONEncoding.default, headers: HTTPHeaders(
+            [HTTPHeader(name: "Authorization", value: "AtField \(token)")]
+        ))
+            .validate()
+            .responseString { response in
+                switch response.result {
+                case .success(_):
+                    break
+                case .failure(let error):
+                    print("Failed to send chat reply message: \(error)")
+                    break
+                }
+                // Call completion handler after network request is finished
+                completionHandler()
+            }
     }
 }

ios/Runner/Runner.entitlements

@@ -11,10 +11,15 @@
 	<key>com.apple.developer.associated-domains</key>
 	<array>
 		<string>webcredentials:solian.app</string>
+		<string>applinks:solian.app</string>
 	</array>
 	<key>com.apple.developer.device-information.user-assigned-device-name</key>
 	<true/>
 	<key>com.apple.developer.usernotifications.communication</key>
 	<true/>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.solsynth.solian</string>
+	</array>
 </dict>
 </plist>

ios/SolianNotificationService/NotificationService.swift

@@ -60,21 +60,7 @@ class NotificationService: UNNotificationServiceExtension {
         
         let pfpIdentifier = meta["pfp"] as? String
         
-        let replyableMessageCategory = UNNotificationCategory(
-            identifier: content.categoryIdentifier,
-            actions: [
-                UNTextInputNotificationAction(
-                    identifier: "reply_action",
-                    title: "Reply",
-                    options: []
-                ),
-            ],
-            intentIdentifiers: [],
-            options: []
-        )
-        
-        UNUserNotificationCenter.current().setNotificationCategories([replyableMessageCategory])
-        content.categoryIdentifier = replyableMessageCategory.identifier
+        content.categoryIdentifier = "REPLYABLE_MESSAGE"
         
         let metaCopy = meta as? [String: Any] ?? [:]
         let pfpUrl = pfpIdentifier != nil ? getAttachmentUrl(for: pfpIdentifier!) : nil

ios/SolianNotificationService/SolianNotificationService.entitlements

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.solsynth.solian</string>
+	</array>
+</dict>
+</plist>

ios/SolianShareExtension/Base.lproj/MainInterface.storyboard

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="j1y-V4-xli">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Share View Controller-->
+        <scene sceneID="ceB-am-kn3">
+            <objects>
+                <viewController id="j1y-V4-xli" customClass="ShareViewController" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" opaque="NO" contentMode="scaleToFill" id="wbc-yd-nQP">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <viewLayoutGuide key="safeArea" id="1Xd-am-t49"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="CEy-Cv-SGf" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+</document>

ios/SolianShareExtension/Info.plist

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>AppGroupId</key>
+    <string>$(CUSTOM_GROUP_ID)</string>
+    <key>CFBundleVersion</key>
+    <string>$(FLUTTER_BUILD_NUMBER)</string>
+    <key>NSExtension</key>
+    <dict>
+        <key>NSExtensionAttributes</key>
+        <dict>
+            <key>PHSupportedMediaTypes</key>
+            <array>
+                <!--TODO: Add this flag, if you want to support sharing video into your app-->
+                <string>Video</string>
+                <!--TODO: Add this flag, if you want to support sharing images into your app-->
+                <string>Image</string>
+            </array>
+            <key>NSExtensionActivationRule</key>
+            <dict>
+                <key>NSExtensionActivationSupportsText</key>
+                <true/>
+                <key>NSExtensionActivationSupportsWebURLWithMaxCount</key>
+                <integer>1</integer>
+                <key>NSExtensionActivationSupportsWebPageWithMaxCount</key>
+                <integer>1</integer>
+                <key>NSExtensionActivationSupportsImageWithMaxCount</key>
+                <integer>100</integer>
+                <key>NSExtensionActivationSupportsMovieWithMaxCount</key>
+                <integer>100</integer>
+                <key>NSExtensionActivationSupportsFileWithMaxCount</key>
+                <integer>100</integer>
+            </dict>
+        </dict>
+        <key>NSExtensionMainStoryboard</key>
+        <string>MainInterface</string>
+        <key>NSExtensionPointIdentifier</key>
+        <string>com.apple.share-services</string>
+    </dict>
+</dict>
+</plist>

ios/SolianShareExtension/ShareViewController.swift

@@ -0,0 +1,14 @@
+//
+//  ShareViewController.swift
+//  SolianShareExtension
+//
+//  Created by LittleSheep on 2025/6/25.
+//
+
+import receive_sharing_intent
+
+class ShareViewController: RSIShareViewController {
+    override func shouldAutoRedirect() -> Bool {
+        return true
+    }
+}

ios/SolianShareExtension/SolianShareExtension.entitlements

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.solsynth.solian</string>
+	</array>
+</dict>
+</plist>

lib/database/draft.dart

@@ -0,0 +1,10 @@
+import 'package:drift/drift.dart';
+
+class PostDrafts extends Table {
+  TextColumn get id => text()();
+  TextColumn get post => text()(); // Store SnPost model as JSON string
+  DateTimeColumn get lastModified => dateTime()();
+
+  @override
+  Set<Column> get primaryKey => {id};
+}

lib/database/drift_db.dart

@@ -1,16 +1,18 @@
 import 'dart:convert';
 import 'package:drift/drift.dart';
 import 'package:island/database/message.dart';
+import 'package:island/database/draft.dart';
+import 'package:island/models/post.dart';
 
 part 'drift_db.g.dart';
 
 // Define the database
-@DriftDatabase(tables: [ChatMessages])
+@DriftDatabase(tables: [ChatMessages, PostDrafts])
 class AppDatabase extends _$AppDatabase {
   AppDatabase(super.e);
 
   @override
-  int get schemaVersion => 2;
+  int get schemaVersion => 4;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -22,6 +24,10 @@ class AppDatabase extends _$AppDatabase {
         // Add isRead column with default value false
         await m.addColumn(chatMessages, chatMessages.isRead);
       }
+      if (from < 4) {
+        // Drop old draft tables if they exist
+        await m.createTable(postDrafts);
+      }
     },
   );
 
@@ -91,4 +97,24 @@ class AppDatabase extends _$AppDatabase {
       isRead: dbMessage.isRead,
     );
   }
+
+  // Methods for post drafts
+  Future<List<SnPost>> getAllPostDrafts() async {
+    final drafts = await select(postDrafts).get();
+    return drafts
+        .map((draft) => SnPost.fromJson(jsonDecode(draft.post)))
+        .toList();
+  }
+
+  Future<void> addPostDraft(PostDraftsCompanion entry) async {
+    await into(postDrafts).insert(entry, mode: InsertMode.replace);
+  }
+
+  Future<void> deletePostDraft(String id) async {
+    await (delete(postDrafts)..where((tbl) => tbl.id.equals(id))).go();
+  }
+
+  Future<void> clearAllPostDrafts() async {
+    await delete(postDrafts).go();
+  }
 }

lib/database/drift_db.g.dart

@@ -569,15 +569,287 @@ class ChatMessagesCompanion extends UpdateCompanion<ChatMessage> {
   }
 }
 
+class $PostDraftsTable extends PostDrafts
+    with TableInfo<$PostDraftsTable, PostDraft> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $PostDraftsTable(this.attachedDatabase, [this._alias]);
+  static const VerificationMeta _idMeta = const VerificationMeta('id');
+  @override
+  late final GeneratedColumn<String> id = GeneratedColumn<String>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _postMeta = const VerificationMeta('post');
+  @override
+  late final GeneratedColumn<String> post = GeneratedColumn<String>(
+    'post',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _lastModifiedMeta = const VerificationMeta(
+    'lastModified',
+  );
+  @override
+  late final GeneratedColumn<DateTime> lastModified = GeneratedColumn<DateTime>(
+    'last_modified',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: true,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [id, post, lastModified];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'post_drafts';
+  @override
+  VerificationContext validateIntegrity(
+    Insertable<PostDraft> instance, {
+    bool isInserting = false,
+  }) {
+    final context = VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    } else if (isInserting) {
+      context.missing(_idMeta);
+    }
+    if (data.containsKey('post')) {
+      context.handle(
+        _postMeta,
+        post.isAcceptableOrUnknown(data['post']!, _postMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_postMeta);
+    }
+    if (data.containsKey('last_modified')) {
+      context.handle(
+        _lastModifiedMeta,
+        lastModified.isAcceptableOrUnknown(
+          data['last_modified']!,
+          _lastModifiedMeta,
+        ),
+      );
+    } else if (isInserting) {
+      context.missing(_lastModifiedMeta);
+    }
+    return context;
+  }
+
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  PostDraft map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return PostDraft(
+      id:
+          attachedDatabase.typeMapping.read(
+            DriftSqlType.string,
+            data['${effectivePrefix}id'],
+          )!,
+      post:
+          attachedDatabase.typeMapping.read(
+            DriftSqlType.string,
+            data['${effectivePrefix}post'],
+          )!,
+      lastModified:
+          attachedDatabase.typeMapping.read(
+            DriftSqlType.dateTime,
+            data['${effectivePrefix}last_modified'],
+          )!,
+    );
+  }
+
+  @override
+  $PostDraftsTable createAlias(String alias) {
+    return $PostDraftsTable(attachedDatabase, alias);
+  }
+}
+
+class PostDraft extends DataClass implements Insertable<PostDraft> {
+  final String id;
+  final String post;
+  final DateTime lastModified;
+  const PostDraft({
+    required this.id,
+    required this.post,
+    required this.lastModified,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<String>(id);
+    map['post'] = Variable<String>(post);
+    map['last_modified'] = Variable<DateTime>(lastModified);
+    return map;
+  }
+
+  PostDraftsCompanion toCompanion(bool nullToAbsent) {
+    return PostDraftsCompanion(
+      id: Value(id),
+      post: Value(post),
+      lastModified: Value(lastModified),
+    );
+  }
+
+  factory PostDraft.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return PostDraft(
+      id: serializer.fromJson<String>(json['id']),
+      post: serializer.fromJson<String>(json['post']),
+      lastModified: serializer.fromJson<DateTime>(json['lastModified']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<String>(id),
+      'post': serializer.toJson<String>(post),
+      'lastModified': serializer.toJson<DateTime>(lastModified),
+    };
+  }
+
+  PostDraft copyWith({String? id, String? post, DateTime? lastModified}) =>
+      PostDraft(
+        id: id ?? this.id,
+        post: post ?? this.post,
+        lastModified: lastModified ?? this.lastModified,
+      );
+  PostDraft copyWithCompanion(PostDraftsCompanion data) {
+    return PostDraft(
+      id: data.id.present ? data.id.value : this.id,
+      post: data.post.present ? data.post.value : this.post,
+      lastModified:
+          data.lastModified.present
+              ? data.lastModified.value
+              : this.lastModified,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('PostDraft(')
+          ..write('id: $id, ')
+          ..write('post: $post, ')
+          ..write('lastModified: $lastModified')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(id, post, lastModified);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is PostDraft &&
+          other.id == this.id &&
+          other.post == this.post &&
+          other.lastModified == this.lastModified);
+}
+
+class PostDraftsCompanion extends UpdateCompanion<PostDraft> {
+  final Value<String> id;
+  final Value<String> post;
+  final Value<DateTime> lastModified;
+  final Value<int> rowid;
+  const PostDraftsCompanion({
+    this.id = const Value.absent(),
+    this.post = const Value.absent(),
+    this.lastModified = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  PostDraftsCompanion.insert({
+    required String id,
+    required String post,
+    required DateTime lastModified,
+    this.rowid = const Value.absent(),
+  }) : id = Value(id),
+       post = Value(post),
+       lastModified = Value(lastModified);
+  static Insertable<PostDraft> custom({
+    Expression<String>? id,
+    Expression<String>? post,
+    Expression<DateTime>? lastModified,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (post != null) 'post': post,
+      if (lastModified != null) 'last_modified': lastModified,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  PostDraftsCompanion copyWith({
+    Value<String>? id,
+    Value<String>? post,
+    Value<DateTime>? lastModified,
+    Value<int>? rowid,
+  }) {
+    return PostDraftsCompanion(
+      id: id ?? this.id,
+      post: post ?? this.post,
+      lastModified: lastModified ?? this.lastModified,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<String>(id.value);
+    }
+    if (post.present) {
+      map['post'] = Variable<String>(post.value);
+    }
+    if (lastModified.present) {
+      map['last_modified'] = Variable<DateTime>(lastModified.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('PostDraftsCompanion(')
+          ..write('id: $id, ')
+          ..write('post: $post, ')
+          ..write('lastModified: $lastModified, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
 abstract class _$AppDatabase extends GeneratedDatabase {
   _$AppDatabase(QueryExecutor e) : super(e);
   $AppDatabaseManager get managers => $AppDatabaseManager(this);
   late final $ChatMessagesTable chatMessages = $ChatMessagesTable(this);
+  late final $PostDraftsTable postDrafts = $PostDraftsTable(this);
   @override
   Iterable<TableInfo<Table, Object?>> get allTables =>
       allSchemaEntities.whereType<TableInfo<Table, Object?>>();
   @override
-  List<DatabaseSchemaEntity> get allSchemaEntities => [chatMessages];
+  List<DatabaseSchemaEntity> get allSchemaEntities => [
+    chatMessages,
+    postDrafts,
+  ];
 }
 
 typedef $$ChatMessagesTableCreateCompanionBuilder =
@@ -865,10 +1137,180 @@ typedef $$ChatMessagesTableProcessedTableManager =
       ChatMessage,
       PrefetchHooks Function()
     >;
+typedef $$PostDraftsTableCreateCompanionBuilder =
+    PostDraftsCompanion Function({
+      required String id,
+      required String post,
+      required DateTime lastModified,
+      Value<int> rowid,
+    });
+typedef $$PostDraftsTableUpdateCompanionBuilder =
+    PostDraftsCompanion Function({
+      Value<String> id,
+      Value<String> post,
+      Value<DateTime> lastModified,
+      Value<int> rowid,
+    });
+
+class $$PostDraftsTableFilterComposer
+    extends Composer<_$AppDatabase, $PostDraftsTable> {
+  $$PostDraftsTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnFilters<String> get id => $composableBuilder(
+    column: $table.id,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get post => $composableBuilder(
+    column: $table.post,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<DateTime> get lastModified => $composableBuilder(
+    column: $table.lastModified,
+    builder: (column) => ColumnFilters(column),
+  );
+}
+
+class $$PostDraftsTableOrderingComposer
+    extends Composer<_$AppDatabase, $PostDraftsTable> {
+  $$PostDraftsTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnOrderings<String> get id => $composableBuilder(
+    column: $table.id,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get post => $composableBuilder(
+    column: $table.post,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<DateTime> get lastModified => $composableBuilder(
+    column: $table.lastModified,
+    builder: (column) => ColumnOrderings(column),
+  );
+}
+
+class $$PostDraftsTableAnnotationComposer
+    extends Composer<_$AppDatabase, $PostDraftsTable> {
+  $$PostDraftsTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  GeneratedColumn<String> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  GeneratedColumn<String> get post =>
+      $composableBuilder(column: $table.post, builder: (column) => column);
+
+  GeneratedColumn<DateTime> get lastModified => $composableBuilder(
+    column: $table.lastModified,
+    builder: (column) => column,
+  );
+}
+
+class $$PostDraftsTableTableManager
+    extends
+        RootTableManager<
+          _$AppDatabase,
+          $PostDraftsTable,
+          PostDraft,
+          $$PostDraftsTableFilterComposer,
+          $$PostDraftsTableOrderingComposer,
+          $$PostDraftsTableAnnotationComposer,
+          $$PostDraftsTableCreateCompanionBuilder,
+          $$PostDraftsTableUpdateCompanionBuilder,
+          (
+            PostDraft,
+            BaseReferences<_$AppDatabase, $PostDraftsTable, PostDraft>,
+          ),
+          PostDraft,
+          PrefetchHooks Function()
+        > {
+  $$PostDraftsTableTableManager(_$AppDatabase db, $PostDraftsTable table)
+    : super(
+        TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer:
+              () => $$PostDraftsTableFilterComposer($db: db, $table: table),
+          createOrderingComposer:
+              () => $$PostDraftsTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer:
+              () => $$PostDraftsTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback:
+              ({
+                Value<String> id = const Value.absent(),
+                Value<String> post = const Value.absent(),
+                Value<DateTime> lastModified = const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => PostDraftsCompanion(
+                id: id,
+                post: post,
+                lastModified: lastModified,
+                rowid: rowid,
+              ),
+          createCompanionCallback:
+              ({
+                required String id,
+                required String post,
+                required DateTime lastModified,
+                Value<int> rowid = const Value.absent(),
+              }) => PostDraftsCompanion.insert(
+                id: id,
+                post: post,
+                lastModified: lastModified,
+                rowid: rowid,
+              ),
+          withReferenceMapper:
+              (p0) =>
+                  p0
+                      .map(
+                        (e) => (
+                          e.readTable(table),
+                          BaseReferences(db, table, e),
+                        ),
+                      )
+                      .toList(),
+          prefetchHooksCallback: null,
+        ),
+      );
+}
+
+typedef $$PostDraftsTableProcessedTableManager =
+    ProcessedTableManager<
+      _$AppDatabase,
+      $PostDraftsTable,
+      PostDraft,
+      $$PostDraftsTableFilterComposer,
+      $$PostDraftsTableOrderingComposer,
+      $$PostDraftsTableAnnotationComposer,
+      $$PostDraftsTableCreateCompanionBuilder,
+      $$PostDraftsTableUpdateCompanionBuilder,
+      (PostDraft, BaseReferences<_$AppDatabase, $PostDraftsTable, PostDraft>),
+      PostDraft,
+      PrefetchHooks Function()
+    >;
 
 class $AppDatabaseManager {
   final _$AppDatabase _db;
   $AppDatabaseManager(this._db);
   $$ChatMessagesTableTableManager get chatMessages =>
       $$ChatMessagesTableTableManager(_db, _db.chatMessages);
+  $$PostDraftsTableTableManager get postDrafts =>
+      $$PostDraftsTableTableManager(_db, _db.postDrafts);
 }

lib/database/message_repository.dart

@@ -71,25 +71,32 @@ class MessageRepository {
     bool synced = false,
   }) async {
     try {
+      // For initial load, fetch latest messages in the background to sync.
+      if (offset == 0 && !synced) {
+        // Not awaiting this is intentional, for a quicker UI response.
+        // The UI should rely on a stream from the database to get updates.
+        _fetchAndCacheMessages(room.id, offset: 0, take: take).catchError((_) {
+          // Best effort, errors will be handled by later fetches.
+          return <LocalChatMessage>[];
+        });
+      }
+
       final localMessages = await _getCachedMessages(
         room.id,
         offset: offset,
         take: take,
       );
 
-      // If it already synced with the remote, skip this
-      if (offset == 0 && !synced) {
-        // Fetch latest messages
-        _fetchAndCacheMessages(room.id, offset: offset, take: take);
-
-        if (localMessages.isNotEmpty) {
-          return localMessages;
-        }
+      // If local cache has messages, return them. This is the common case for scrolling up.
+      if (localMessages.isNotEmpty) {
+        return localMessages;
       }
 
+      // If local cache is empty, we've probably reached the end of cached history.
+      // Fetch from remote. This will also be hit on first load if cache is empty.
       return await _fetchAndCacheMessages(room.id, offset: offset, take: take);
     } catch (e) {
-      // If API fails but we have local messages, return them
+      // Final fallback to cache in case of network errors during fetch.
       final localMessages = await _getCachedMessages(
         room.id,
         offset: offset,
@@ -117,24 +124,26 @@ class MessageRepository {
     final dbLocalMessages =
         dbMessages.map(_database.companionToMessage).toList();
 
-    // Combine with pending messages
-    final pendingForRoom =
-        pendingMessages.values.where((msg) => msg.roomId == roomId).toList();
+    // Combine with pending messages for the first page
+    if (offset == 0) {
+      final pendingForRoom =
+          pendingMessages.values.where((msg) => msg.roomId == roomId).toList();
 
-    // Sort by timestamp descending (newest first)
-    final allMessages = [...pendingForRoom, ...dbLocalMessages];
-    allMessages.sort((a, b) => b.createdAt.compareTo(a.createdAt));
+      final allMessages = [...pendingForRoom, ...dbLocalMessages];
+      allMessages.sort((a, b) => b.createdAt.compareTo(a.createdAt));
 
-    // Apply pagination
-    if (offset >= allMessages.length) {
-      return [];
+      // Remove duplicates by ID, preserving the order
+      final uniqueMessages = <LocalChatMessage>[];
+      final seenIds = <String>{};
+      for (final message in allMessages) {
+        if (seenIds.add(message.id)) {
+          uniqueMessages.add(message);
+        }
+      }
+      return uniqueMessages;
     }
 
-    final end =
-        (offset + take) > allMessages.length
-            ? allMessages.length
-            : (offset + take);
-    return allMessages.sublist(offset, end);
+    return dbLocalMessages;
   }
 
   Future<List<LocalChatMessage>> _fetchAndCacheMessages(

lib/main.dart

@@ -18,7 +18,7 @@ import 'package:bitsdojo_window/bitsdojo_window.dart';
 import 'package:island/pods/userinfo.dart';
 import 'package:island/pods/websocket.dart';
 import 'package:island/route.dart';
-import 'package:island/screens/auth/tabs.dart';
+
 import 'package:island/services/notify.dart';
 import 'package:island/services/timezone.dart';
 import 'package:island/widgets/alert.dart';
@@ -29,6 +29,12 @@ import 'package:image_picker_platform_interface/image_picker_platform_interface.
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
+@pragma('vm:entry-point')
+Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
+  await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
+  log('Handling a background message: ${message.messageId}');
+}
+
 void main() async {
   final widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
   if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
@@ -43,6 +49,7 @@ void main() async {
     await Firebase.initializeApp(
       options: DefaultFirebaseOptions.currentPlatform,
     );
+    FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler);
     log("[SplashScreen] Firebase is ready!");
   } catch (err) {
     showErrorAlert(err);
@@ -60,12 +67,33 @@ void main() async {
 
   if (!kIsWeb && (Platform.isMacOS || Platform.isLinux || Platform.isWindows)) {
     doWhenWindowReady(() {
-      const initialSize = Size(360, 640);
-      appWindow.minSize = initialSize;
+      const defaultSize = Size(360, 640);
+
+      // Get saved window size from preferences
+      final savedSizeString = prefs.getString(kAppWindowSize);
+      Size initialSize = defaultSize;
+
+      if (savedSizeString != null) {
+        try {
+          final parts = savedSizeString.split(',');
+          if (parts.length == 2) {
+            final width = double.parse(parts[0]);
+            final height = double.parse(parts[1]);
+            initialSize = Size(width, height);
+          }
+        } catch (e) {
+          log("[SplashScreen] Failed to parse saved window size: $e");
+          initialSize = defaultSize;
+        }
+      }
+
+      appWindow.minSize = defaultSize;
       appWindow.size = initialSize;
       appWindow.alignment = Alignment.center;
       appWindow.show();
-      log("[SplashScreen] Desktop window is ready!");
+      log(
+        "[SplashScreen] Desktop window is ready with size: ${initialSize.width}x${initialSize.height}",
+      );
     });
   }
 
@@ -104,7 +132,9 @@ void main() async {
   );
 }
 
-final appRouter = AppRouter();
+// Router will be provided through Riverpod
+
+final globalOverlay = GlobalKey<OverlayState>();
 
 class IslandApp extends HookConsumerWidget {
   const IslandApp({super.key});
@@ -118,7 +148,8 @@ class IslandApp extends HookConsumerWidget {
         var uri = notification.data['action_uri'] as String;
         if (uri.startsWith('/')) {
           // In-app routes
-          appRouter.pushPath(notification.data['action_uri']);
+          final router = ref.read(routerProvider);
+          router.go(notification.data['action_uri']);
         } else {
           // External links
           launchUrlString(uri);
@@ -127,17 +158,30 @@ class IslandApp extends HookConsumerWidget {
     }
 
     useEffect(() {
-      Future(() async {
-        RemoteMessage? initialMessage =
-            await FirebaseMessaging.instance.getInitialMessage();
-        if (initialMessage != null) {
-          handleMessage(initialMessage);
+      // When the app is opened from a terminated state.
+      FirebaseMessaging.instance.getInitialMessage().then((message) {
+        if (message != null) {
+          handleMessage(message);
         }
-
-        FirebaseMessaging.onMessageOpenedApp.listen(handleMessage);
       });
 
-      return null;
+      // When the app is in the background and opened.
+      final onMessageOpenedAppSubscription = FirebaseMessaging
+          .onMessageOpenedApp
+          .listen(handleMessage);
+
+      // When the app is in the foreground.
+      final onMessageSubscription = FirebaseMessaging.onMessage.listen((
+        message,
+      ) {
+        log('Foreground message received: ${message.messageId}');
+        handleMessage(message);
+      });
+
+      return () {
+        onMessageOpenedAppSubscription.cancel();
+        onMessageSubscription.cancel();
+      };
     }, []);
 
     useEffect(() {
@@ -160,39 +204,28 @@ class IslandApp extends HookConsumerWidget {
       return null;
     }, []);
 
+    final router = ref.watch(routerProvider);
+
     return MaterialApp.router(
       theme: theme?.light,
       darkTheme: theme?.dark,
       themeMode: ThemeMode.system,
-      routerConfig: appRouter.config(
-        navigatorObservers:
-            () => [
-              TabNavigationObserver(
-                onChange: (route) {
-                  ref.read(currentRouteProvider.notifier).state = route;
-                },
-              ),
-            ],
-      ),
+      routerConfig: router,
       supportedLocales: context.supportedLocales,
       localizationsDelegates: [
         ...context.localizationDelegates,
         CroppyLocalizations.delegate,
         RelativeTimeLocalizations.delegate,
-      ], // this contains the cupertino one
+      ],
       locale: context.locale,
       builder: (context, child) {
         return Overlay(
+          key: globalOverlay,
           initialEntries: [
             OverlayEntry(
               builder:
-                  (_) => WindowScaffold(
-                    router: appRouter,
-                    child: TabsNavigationWidget(
-                      router: appRouter,
-                      child: child ?? const SizedBox.shrink(),
-                    ),
-                  ),
+                  (_) =>
+                      WindowScaffold(child: child ?? const SizedBox.shrink()),
             ),
           ],
         );

lib/models/chat.dart

@@ -13,7 +13,8 @@ sealed class SnChatRoom with _$SnChatRoom {
     required String? name,
     required String? description,
     required int type,
-    required bool isPublic,
+    @Default(false) bool isPublic,
+    @Default(false) bool isCommunity,
     required SnCloudFile? picture,
     required SnCloudFile? background,
     required String? realmId,

lib/models/chat.freezed.dart

@@ -16,7 +16,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$SnChatRoom {
 
- String get id; String? get name; String? get description; int get type; bool get isPublic; SnCloudFile? get picture; SnCloudFile? get background; String? get realmId; SnRealm? get realm; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt; List<SnChatMember>? get members;
+ String get id; String? get name; String? get description; int get type; bool get isPublic; bool get isCommunity; SnCloudFile? get picture; SnCloudFile? get background; String? get realmId; SnRealm? get realm; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt; List<SnChatMember>? get members;
 /// Create a copy of SnChatRoom
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -29,16 +29,16 @@ $SnChatRoomCopyWith<SnChatRoom> get copyWith => _$SnChatRoomCopyWithImpl<SnChatR
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnChatRoom&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&(identical(other.type, type) || other.type == type)&&(identical(other.isPublic, isPublic) || other.isPublic == isPublic)&&(identical(other.picture, picture) || other.picture == picture)&&(identical(other.background, background) || other.background == background)&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&const DeepCollectionEquality().equals(other.members, members));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnChatRoom&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&(identical(other.type, type) || other.type == type)&&(identical(other.isPublic, isPublic) || other.isPublic == isPublic)&&(identical(other.isCommunity, isCommunity) || other.isCommunity == isCommunity)&&(identical(other.picture, picture) || other.picture == picture)&&(identical(other.background, background) || other.background == background)&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&const DeepCollectionEquality().equals(other.members, members));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,id,name,description,type,isPublic,picture,background,realmId,realm,createdAt,updatedAt,deletedAt,const DeepCollectionEquality().hash(members));
+int get hashCode => Object.hash(runtimeType,id,name,description,type,isPublic,isCommunity,picture,background,realmId,realm,createdAt,updatedAt,deletedAt,const DeepCollectionEquality().hash(members));
 
 @override
 String toString() {
-  return 'SnChatRoom(id: $id, name: $name, description: $description, type: $type, isPublic: $isPublic, picture: $picture, background: $background, realmId: $realmId, realm: $realm, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, members: $members)';
+  return 'SnChatRoom(id: $id, name: $name, description: $description, type: $type, isPublic: $isPublic, isCommunity: $isCommunity, picture: $picture, background: $background, realmId: $realmId, realm: $realm, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, members: $members)';
 }
 
 
@@ -49,7 +49,7 @@ abstract mixin class $SnChatRoomCopyWith<$Res>  {
   factory $SnChatRoomCopyWith(SnChatRoom value, $Res Function(SnChatRoom) _then) = _$SnChatRoomCopyWithImpl;
 @useResult
 $Res call({
- String id, String? name, String? description, int type, bool isPublic, SnCloudFile? picture, SnCloudFile? background, String? realmId, SnRealm? realm, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, List<SnChatMember>? members
+ String id, String? name, String? description, int type, bool isPublic, bool isCommunity, SnCloudFile? picture, SnCloudFile? background, String? realmId, SnRealm? realm, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, List<SnChatMember>? members
 });
 
 
@@ -66,13 +66,14 @@ class _$SnChatRoomCopyWithImpl<$Res>
 
 /// Create a copy of SnChatRoom
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? name = freezed,Object? description = freezed,Object? type = null,Object? isPublic = null,Object? picture = freezed,Object? background = freezed,Object? realmId = freezed,Object? realm = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? members = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? name = freezed,Object? description = freezed,Object? type = null,Object? isPublic = null,Object? isCommunity = null,Object? picture = freezed,Object? background = freezed,Object? realmId = freezed,Object? realm = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? members = freezed,}) {
   return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
 as String?,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
 as String?,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as int,isPublic: null == isPublic ? _self.isPublic : isPublic // ignore: cast_nullable_to_non_nullable
+as bool,isCommunity: null == isCommunity ? _self.isCommunity : isCommunity // ignore: cast_nullable_to_non_nullable
 as bool,picture: freezed == picture ? _self.picture : picture // ignore: cast_nullable_to_non_nullable
 as SnCloudFile?,background: freezed == background ? _self.background : background // ignore: cast_nullable_to_non_nullable
 as SnCloudFile?,realmId: freezed == realmId ? _self.realmId : realmId // ignore: cast_nullable_to_non_nullable
@@ -128,14 +129,15 @@ $SnRealmCopyWith<$Res>? get realm {
 @JsonSerializable()
 
 class _SnChatRoom implements SnChatRoom {
-  const _SnChatRoom({required this.id, required this.name, required this.description, required this.type, required this.isPublic, required this.picture, required this.background, required this.realmId, required this.realm, required this.createdAt, required this.updatedAt, required this.deletedAt, required final  List<SnChatMember>? members}): _members = members;
+  const _SnChatRoom({required this.id, required this.name, required this.description, required this.type, this.isPublic = false, this.isCommunity = false, required this.picture, required this.background, required this.realmId, required this.realm, required this.createdAt, required this.updatedAt, required this.deletedAt, required final  List<SnChatMember>? members}): _members = members;
   factory _SnChatRoom.fromJson(Map<String, dynamic> json) => _$SnChatRoomFromJson(json);
 
 @override final  String id;
 @override final  String? name;
 @override final  String? description;
 @override final  int type;
-@override final  bool isPublic;
+@override@JsonKey() final  bool isPublic;
+@override@JsonKey() final  bool isCommunity;
 @override final  SnCloudFile? picture;
 @override final  SnCloudFile? background;
 @override final  String? realmId;
@@ -166,16 +168,16 @@ Map<String, dynamic> toJson() {
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnChatRoom&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&(identical(other.type, type) || other.type == type)&&(identical(other.isPublic, isPublic) || other.isPublic == isPublic)&&(identical(other.picture, picture) || other.picture == picture)&&(identical(other.background, background) || other.background == background)&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&const DeepCollectionEquality().equals(other._members, _members));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnChatRoom&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&(identical(other.type, type) || other.type == type)&&(identical(other.isPublic, isPublic) || other.isPublic == isPublic)&&(identical(other.isCommunity, isCommunity) || other.isCommunity == isCommunity)&&(identical(other.picture, picture) || other.picture == picture)&&(identical(other.background, background) || other.background == background)&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&const DeepCollectionEquality().equals(other._members, _members));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,id,name,description,type,isPublic,picture,background,realmId,realm,createdAt,updatedAt,deletedAt,const DeepCollectionEquality().hash(_members));
+int get hashCode => Object.hash(runtimeType,id,name,description,type,isPublic,isCommunity,picture,background,realmId,realm,createdAt,updatedAt,deletedAt,const DeepCollectionEquality().hash(_members));
 
 @override
 String toString() {
-  return 'SnChatRoom(id: $id, name: $name, description: $description, type: $type, isPublic: $isPublic, picture: $picture, background: $background, realmId: $realmId, realm: $realm, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, members: $members)';
+  return 'SnChatRoom(id: $id, name: $name, description: $description, type: $type, isPublic: $isPublic, isCommunity: $isCommunity, picture: $picture, background: $background, realmId: $realmId, realm: $realm, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, members: $members)';
 }
 
 
@@ -186,7 +188,7 @@ abstract mixin class _$SnChatRoomCopyWith<$Res> implements $SnChatRoomCopyWith<$
   factory _$SnChatRoomCopyWith(_SnChatRoom value, $Res Function(_SnChatRoom) _then) = __$SnChatRoomCopyWithImpl;
 @override @useResult
 $Res call({
- String id, String? name, String? description, int type, bool isPublic, SnCloudFile? picture, SnCloudFile? background, String? realmId, SnRealm? realm, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, List<SnChatMember>? members
+ String id, String? name, String? description, int type, bool isPublic, bool isCommunity, SnCloudFile? picture, SnCloudFile? background, String? realmId, SnRealm? realm, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, List<SnChatMember>? members
 });
 
 
@@ -203,13 +205,14 @@ class __$SnChatRoomCopyWithImpl<$Res>
 
 /// Create a copy of SnChatRoom
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? name = freezed,Object? description = freezed,Object? type = null,Object? isPublic = null,Object? picture = freezed,Object? background = freezed,Object? realmId = freezed,Object? realm = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? members = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? name = freezed,Object? description = freezed,Object? type = null,Object? isPublic = null,Object? isCommunity = null,Object? picture = freezed,Object? background = freezed,Object? realmId = freezed,Object? realm = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? members = freezed,}) {
   return _then(_SnChatRoom(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
 as String?,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
 as String?,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as int,isPublic: null == isPublic ? _self.isPublic : isPublic // ignore: cast_nullable_to_non_nullable
+as bool,isCommunity: null == isCommunity ? _self.isCommunity : isCommunity // ignore: cast_nullable_to_non_nullable
 as bool,picture: freezed == picture ? _self.picture : picture // ignore: cast_nullable_to_non_nullable
 as SnCloudFile?,background: freezed == background ? _self.background : background // ignore: cast_nullable_to_non_nullable
 as SnCloudFile?,realmId: freezed == realmId ? _self.realmId : realmId // ignore: cast_nullable_to_non_nullable

lib/models/chat.g.dart

@@ -11,7 +11,8 @@ _SnChatRoom _$SnChatRoomFromJson(Map<String, dynamic> json) => _SnChatRoom(
   name: json['name'] as String?,
   description: json['description'] as String?,
   type: (json['type'] as num).toInt(),
-  isPublic: json['is_public'] as bool,
+  isPublic: json['is_public'] as bool? ?? false,
+  isCommunity: json['is_community'] as bool? ?? false,
   picture:
       json['picture'] == null
           ? null
@@ -44,6 +45,7 @@ Map<String, dynamic> _$SnChatRoomToJson(_SnChatRoom instance) =>
       'description': instance.description,
       'type': instance.type,
       'is_public': instance.isPublic,
+      'is_community': instance.isCommunity,
       'picture': instance.picture?.toJson(),
       'background': instance.background?.toJson(),
       'realm_id': instance.realmId,

lib/models/embed.dart

@@ -0,0 +1,42 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'embed.freezed.dart';
+part 'embed.g.dart';
+
+@freezed
+sealed class SnEmbedLink with _$SnEmbedLink {
+  const factory SnEmbedLink({
+    @JsonKey(name: 'Type') required String type,
+    @JsonKey(name: 'Url') required String url,
+    @JsonKey(name: 'Title') required String title,
+    @JsonKey(name: 'Description') required String? description,
+    @JsonKey(name: 'ImageUrl') required String? imageUrl,
+    @JsonKey(name: 'FaviconUrl') required String faviconUrl,
+    @JsonKey(name: 'SiteName') required String siteName,
+    @JsonKey(name: 'ContentType') required String? contentType,
+    @JsonKey(name: 'Author') required String? author,
+    @JsonKey(name: 'PublishedDate') required DateTime? publishedDate,
+  }) = _SnEmbedLink;
+
+  factory SnEmbedLink.fromJson(Map<String, dynamic> json) =>
+      _$SnEmbedLinkFromJson(json);
+}
+
+@freezed
+sealed class SnScrappedLink with _$SnScrappedLink {
+  const factory SnScrappedLink({
+    required String type,
+    required String url,
+    required String title,
+    required String? description,
+    required String? imageUrl,
+    required String faviconUrl,
+    required String siteName,
+    required String? contentType,
+    required String? author,
+    required DateTime? publishedDate,
+  }) = _SnScrappedLink;
+
+  factory SnScrappedLink.fromJson(Map<String, dynamic> json) =>
+      _$SnScrappedLinkFromJson(json);
+}

lib/models/embed.freezed.dart

@@ -0,0 +1,335 @@
+// dart format width=80
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'embed.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$SnEmbedLink {
+
+@JsonKey(name: 'Type') String get type;@JsonKey(name: 'Url') String get url;@JsonKey(name: 'Title') String get title;@JsonKey(name: 'Description') String? get description;@JsonKey(name: 'ImageUrl') String? get imageUrl;@JsonKey(name: 'FaviconUrl') String get faviconUrl;@JsonKey(name: 'SiteName') String get siteName;@JsonKey(name: 'ContentType') String? get contentType;@JsonKey(name: 'Author') String? get author;@JsonKey(name: 'PublishedDate') DateTime? get publishedDate;
+/// Create a copy of SnEmbedLink
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnEmbedLinkCopyWith<SnEmbedLink> get copyWith => _$SnEmbedLinkCopyWithImpl<SnEmbedLink>(this as SnEmbedLink, _$identity);
+
+  /// Serializes this SnEmbedLink to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnEmbedLink&&(identical(other.type, type) || other.type == type)&&(identical(other.url, url) || other.url == url)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.imageUrl, imageUrl) || other.imageUrl == imageUrl)&&(identical(other.faviconUrl, faviconUrl) || other.faviconUrl == faviconUrl)&&(identical(other.siteName, siteName) || other.siteName == siteName)&&(identical(other.contentType, contentType) || other.contentType == contentType)&&(identical(other.author, author) || other.author == author)&&(identical(other.publishedDate, publishedDate) || other.publishedDate == publishedDate));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,type,url,title,description,imageUrl,faviconUrl,siteName,contentType,author,publishedDate);
+
+@override
+String toString() {
+  return 'SnEmbedLink(type: $type, url: $url, title: $title, description: $description, imageUrl: $imageUrl, faviconUrl: $faviconUrl, siteName: $siteName, contentType: $contentType, author: $author, publishedDate: $publishedDate)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnEmbedLinkCopyWith<$Res>  {
+  factory $SnEmbedLinkCopyWith(SnEmbedLink value, $Res Function(SnEmbedLink) _then) = _$SnEmbedLinkCopyWithImpl;
+@useResult
+$Res call({
+@JsonKey(name: 'Type') String type,@JsonKey(name: 'Url') String url,@JsonKey(name: 'Title') String title,@JsonKey(name: 'Description') String? description,@JsonKey(name: 'ImageUrl') String? imageUrl,@JsonKey(name: 'FaviconUrl') String faviconUrl,@JsonKey(name: 'SiteName') String siteName,@JsonKey(name: 'ContentType') String? contentType,@JsonKey(name: 'Author') String? author,@JsonKey(name: 'PublishedDate') DateTime? publishedDate
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnEmbedLinkCopyWithImpl<$Res>
+    implements $SnEmbedLinkCopyWith<$Res> {
+  _$SnEmbedLinkCopyWithImpl(this._self, this._then);
+
+  final SnEmbedLink _self;
+  final $Res Function(SnEmbedLink) _then;
+
+/// Create a copy of SnEmbedLink
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? type = null,Object? url = null,Object? title = null,Object? description = freezed,Object? imageUrl = freezed,Object? faviconUrl = null,Object? siteName = null,Object? contentType = freezed,Object? author = freezed,Object? publishedDate = freezed,}) {
+  return _then(_self.copyWith(
+type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
+as String,url: null == url ? _self.url : url // ignore: cast_nullable_to_non_nullable
+as String,title: null == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
+as String,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,imageUrl: freezed == imageUrl ? _self.imageUrl : imageUrl // ignore: cast_nullable_to_non_nullable
+as String?,faviconUrl: null == faviconUrl ? _self.faviconUrl : faviconUrl // ignore: cast_nullable_to_non_nullable
+as String,siteName: null == siteName ? _self.siteName : siteName // ignore: cast_nullable_to_non_nullable
+as String,contentType: freezed == contentType ? _self.contentType : contentType // ignore: cast_nullable_to_non_nullable
+as String?,author: freezed == author ? _self.author : author // ignore: cast_nullable_to_non_nullable
+as String?,publishedDate: freezed == publishedDate ? _self.publishedDate : publishedDate // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+}
+
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnEmbedLink implements SnEmbedLink {
+  const _SnEmbedLink({@JsonKey(name: 'Type') required this.type, @JsonKey(name: 'Url') required this.url, @JsonKey(name: 'Title') required this.title, @JsonKey(name: 'Description') required this.description, @JsonKey(name: 'ImageUrl') required this.imageUrl, @JsonKey(name: 'FaviconUrl') required this.faviconUrl, @JsonKey(name: 'SiteName') required this.siteName, @JsonKey(name: 'ContentType') required this.contentType, @JsonKey(name: 'Author') required this.author, @JsonKey(name: 'PublishedDate') required this.publishedDate});
+  factory _SnEmbedLink.fromJson(Map<String, dynamic> json) => _$SnEmbedLinkFromJson(json);
+
+@override@JsonKey(name: 'Type') final  String type;
+@override@JsonKey(name: 'Url') final  String url;
+@override@JsonKey(name: 'Title') final  String title;
+@override@JsonKey(name: 'Description') final  String? description;
+@override@JsonKey(name: 'ImageUrl') final  String? imageUrl;
+@override@JsonKey(name: 'FaviconUrl') final  String faviconUrl;
+@override@JsonKey(name: 'SiteName') final  String siteName;
+@override@JsonKey(name: 'ContentType') final  String? contentType;
+@override@JsonKey(name: 'Author') final  String? author;
+@override@JsonKey(name: 'PublishedDate') final  DateTime? publishedDate;
+
+/// Create a copy of SnEmbedLink
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnEmbedLinkCopyWith<_SnEmbedLink> get copyWith => __$SnEmbedLinkCopyWithImpl<_SnEmbedLink>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnEmbedLinkToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnEmbedLink&&(identical(other.type, type) || other.type == type)&&(identical(other.url, url) || other.url == url)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.imageUrl, imageUrl) || other.imageUrl == imageUrl)&&(identical(other.faviconUrl, faviconUrl) || other.faviconUrl == faviconUrl)&&(identical(other.siteName, siteName) || other.siteName == siteName)&&(identical(other.contentType, contentType) || other.contentType == contentType)&&(identical(other.author, author) || other.author == author)&&(identical(other.publishedDate, publishedDate) || other.publishedDate == publishedDate));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,type,url,title,description,imageUrl,faviconUrl,siteName,contentType,author,publishedDate);
+
+@override
+String toString() {
+  return 'SnEmbedLink(type: $type, url: $url, title: $title, description: $description, imageUrl: $imageUrl, faviconUrl: $faviconUrl, siteName: $siteName, contentType: $contentType, author: $author, publishedDate: $publishedDate)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnEmbedLinkCopyWith<$Res> implements $SnEmbedLinkCopyWith<$Res> {
+  factory _$SnEmbedLinkCopyWith(_SnEmbedLink value, $Res Function(_SnEmbedLink) _then) = __$SnEmbedLinkCopyWithImpl;
+@override @useResult
+$Res call({
+@JsonKey(name: 'Type') String type,@JsonKey(name: 'Url') String url,@JsonKey(name: 'Title') String title,@JsonKey(name: 'Description') String? description,@JsonKey(name: 'ImageUrl') String? imageUrl,@JsonKey(name: 'FaviconUrl') String faviconUrl,@JsonKey(name: 'SiteName') String siteName,@JsonKey(name: 'ContentType') String? contentType,@JsonKey(name: 'Author') String? author,@JsonKey(name: 'PublishedDate') DateTime? publishedDate
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnEmbedLinkCopyWithImpl<$Res>
+    implements _$SnEmbedLinkCopyWith<$Res> {
+  __$SnEmbedLinkCopyWithImpl(this._self, this._then);
+
+  final _SnEmbedLink _self;
+  final $Res Function(_SnEmbedLink) _then;
+
+/// Create a copy of SnEmbedLink
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? type = null,Object? url = null,Object? title = null,Object? description = freezed,Object? imageUrl = freezed,Object? faviconUrl = null,Object? siteName = null,Object? contentType = freezed,Object? author = freezed,Object? publishedDate = freezed,}) {
+  return _then(_SnEmbedLink(
+type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
+as String,url: null == url ? _self.url : url // ignore: cast_nullable_to_non_nullable
+as String,title: null == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
+as String,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,imageUrl: freezed == imageUrl ? _self.imageUrl : imageUrl // ignore: cast_nullable_to_non_nullable
+as String?,faviconUrl: null == faviconUrl ? _self.faviconUrl : faviconUrl // ignore: cast_nullable_to_non_nullable
+as String,siteName: null == siteName ? _self.siteName : siteName // ignore: cast_nullable_to_non_nullable
+as String,contentType: freezed == contentType ? _self.contentType : contentType // ignore: cast_nullable_to_non_nullable
+as String?,author: freezed == author ? _self.author : author // ignore: cast_nullable_to_non_nullable
+as String?,publishedDate: freezed == publishedDate ? _self.publishedDate : publishedDate // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+
+}
+
+
+/// @nodoc
+mixin _$SnScrappedLink {
+
+ String get type; String get url; String get title; String? get description; String? get imageUrl; String get faviconUrl; String get siteName; String? get contentType; String? get author; DateTime? get publishedDate;
+/// Create a copy of SnScrappedLink
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnScrappedLinkCopyWith<SnScrappedLink> get copyWith => _$SnScrappedLinkCopyWithImpl<SnScrappedLink>(this as SnScrappedLink, _$identity);
+
+  /// Serializes this SnScrappedLink to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnScrappedLink&&(identical(other.type, type) || other.type == type)&&(identical(other.url, url) || other.url == url)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.imageUrl, imageUrl) || other.imageUrl == imageUrl)&&(identical(other.faviconUrl, faviconUrl) || other.faviconUrl == faviconUrl)&&(identical(other.siteName, siteName) || other.siteName == siteName)&&(identical(other.contentType, contentType) || other.contentType == contentType)&&(identical(other.author, author) || other.author == author)&&(identical(other.publishedDate, publishedDate) || other.publishedDate == publishedDate));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,type,url,title,description,imageUrl,faviconUrl,siteName,contentType,author,publishedDate);
+
+@override
+String toString() {
+  return 'SnScrappedLink(type: $type, url: $url, title: $title, description: $description, imageUrl: $imageUrl, faviconUrl: $faviconUrl, siteName: $siteName, contentType: $contentType, author: $author, publishedDate: $publishedDate)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnScrappedLinkCopyWith<$Res>  {
+  factory $SnScrappedLinkCopyWith(SnScrappedLink value, $Res Function(SnScrappedLink) _then) = _$SnScrappedLinkCopyWithImpl;
+@useResult
+$Res call({
+ String type, String url, String title, String? description, String? imageUrl, String faviconUrl, String siteName, String? contentType, String? author, DateTime? publishedDate
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnScrappedLinkCopyWithImpl<$Res>
+    implements $SnScrappedLinkCopyWith<$Res> {
+  _$SnScrappedLinkCopyWithImpl(this._self, this._then);
+
+  final SnScrappedLink _self;
+  final $Res Function(SnScrappedLink) _then;
+
+/// Create a copy of SnScrappedLink
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? type = null,Object? url = null,Object? title = null,Object? description = freezed,Object? imageUrl = freezed,Object? faviconUrl = null,Object? siteName = null,Object? contentType = freezed,Object? author = freezed,Object? publishedDate = freezed,}) {
+  return _then(_self.copyWith(
+type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
+as String,url: null == url ? _self.url : url // ignore: cast_nullable_to_non_nullable
+as String,title: null == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
+as String,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,imageUrl: freezed == imageUrl ? _self.imageUrl : imageUrl // ignore: cast_nullable_to_non_nullable
+as String?,faviconUrl: null == faviconUrl ? _self.faviconUrl : faviconUrl // ignore: cast_nullable_to_non_nullable
+as String,siteName: null == siteName ? _self.siteName : siteName // ignore: cast_nullable_to_non_nullable
+as String,contentType: freezed == contentType ? _self.contentType : contentType // ignore: cast_nullable_to_non_nullable
+as String?,author: freezed == author ? _self.author : author // ignore: cast_nullable_to_non_nullable
+as String?,publishedDate: freezed == publishedDate ? _self.publishedDate : publishedDate // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+}
+
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnScrappedLink implements SnScrappedLink {
+  const _SnScrappedLink({required this.type, required this.url, required this.title, required this.description, required this.imageUrl, required this.faviconUrl, required this.siteName, required this.contentType, required this.author, required this.publishedDate});
+  factory _SnScrappedLink.fromJson(Map<String, dynamic> json) => _$SnScrappedLinkFromJson(json);
+
+@override final  String type;
+@override final  String url;
+@override final  String title;
+@override final  String? description;
+@override final  String? imageUrl;
+@override final  String faviconUrl;
+@override final  String siteName;
+@override final  String? contentType;
+@override final  String? author;
+@override final  DateTime? publishedDate;
+
+/// Create a copy of SnScrappedLink
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnScrappedLinkCopyWith<_SnScrappedLink> get copyWith => __$SnScrappedLinkCopyWithImpl<_SnScrappedLink>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnScrappedLinkToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnScrappedLink&&(identical(other.type, type) || other.type == type)&&(identical(other.url, url) || other.url == url)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.imageUrl, imageUrl) || other.imageUrl == imageUrl)&&(identical(other.faviconUrl, faviconUrl) || other.faviconUrl == faviconUrl)&&(identical(other.siteName, siteName) || other.siteName == siteName)&&(identical(other.contentType, contentType) || other.contentType == contentType)&&(identical(other.author, author) || other.author == author)&&(identical(other.publishedDate, publishedDate) || other.publishedDate == publishedDate));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,type,url,title,description,imageUrl,faviconUrl,siteName,contentType,author,publishedDate);
+
+@override
+String toString() {
+  return 'SnScrappedLink(type: $type, url: $url, title: $title, description: $description, imageUrl: $imageUrl, faviconUrl: $faviconUrl, siteName: $siteName, contentType: $contentType, author: $author, publishedDate: $publishedDate)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnScrappedLinkCopyWith<$Res> implements $SnScrappedLinkCopyWith<$Res> {
+  factory _$SnScrappedLinkCopyWith(_SnScrappedLink value, $Res Function(_SnScrappedLink) _then) = __$SnScrappedLinkCopyWithImpl;
+@override @useResult
+$Res call({
+ String type, String url, String title, String? description, String? imageUrl, String faviconUrl, String siteName, String? contentType, String? author, DateTime? publishedDate
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnScrappedLinkCopyWithImpl<$Res>
+    implements _$SnScrappedLinkCopyWith<$Res> {
+  __$SnScrappedLinkCopyWithImpl(this._self, this._then);
+
+  final _SnScrappedLink _self;
+  final $Res Function(_SnScrappedLink) _then;
+
+/// Create a copy of SnScrappedLink
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? type = null,Object? url = null,Object? title = null,Object? description = freezed,Object? imageUrl = freezed,Object? faviconUrl = null,Object? siteName = null,Object? contentType = freezed,Object? author = freezed,Object? publishedDate = freezed,}) {
+  return _then(_SnScrappedLink(
+type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
+as String,url: null == url ? _self.url : url // ignore: cast_nullable_to_non_nullable
+as String,title: null == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
+as String,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,imageUrl: freezed == imageUrl ? _self.imageUrl : imageUrl // ignore: cast_nullable_to_non_nullable
+as String?,faviconUrl: null == faviconUrl ? _self.faviconUrl : faviconUrl // ignore: cast_nullable_to_non_nullable
+as String,siteName: null == siteName ? _self.siteName : siteName // ignore: cast_nullable_to_non_nullable
+as String,contentType: freezed == contentType ? _self.contentType : contentType // ignore: cast_nullable_to_non_nullable
+as String?,author: freezed == author ? _self.author : author // ignore: cast_nullable_to_non_nullable
+as String?,publishedDate: freezed == publishedDate ? _self.publishedDate : publishedDate // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+
+}
+
+// dart format on

lib/models/embed.g.dart

@@ -0,0 +1,68 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'embed.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_SnEmbedLink _$SnEmbedLinkFromJson(Map<String, dynamic> json) => _SnEmbedLink(
+  type: json['Type'] as String,
+  url: json['Url'] as String,
+  title: json['Title'] as String,
+  description: json['Description'] as String?,
+  imageUrl: json['ImageUrl'] as String?,
+  faviconUrl: json['FaviconUrl'] as String,
+  siteName: json['SiteName'] as String,
+  contentType: json['ContentType'] as String?,
+  author: json['Author'] as String?,
+  publishedDate:
+      json['PublishedDate'] == null
+          ? null
+          : DateTime.parse(json['PublishedDate'] as String),
+);
+
+Map<String, dynamic> _$SnEmbedLinkToJson(_SnEmbedLink instance) =>
+    <String, dynamic>{
+      'Type': instance.type,
+      'Url': instance.url,
+      'Title': instance.title,
+      'Description': instance.description,
+      'ImageUrl': instance.imageUrl,
+      'FaviconUrl': instance.faviconUrl,
+      'SiteName': instance.siteName,
+      'ContentType': instance.contentType,
+      'Author': instance.author,
+      'PublishedDate': instance.publishedDate?.toIso8601String(),
+    };
+
+_SnScrappedLink _$SnScrappedLinkFromJson(Map<String, dynamic> json) =>
+    _SnScrappedLink(
+      type: json['type'] as String,
+      url: json['url'] as String,
+      title: json['title'] as String,
+      description: json['description'] as String?,
+      imageUrl: json['image_url'] as String?,
+      faviconUrl: json['favicon_url'] as String,
+      siteName: json['site_name'] as String,
+      contentType: json['content_type'] as String?,
+      author: json['author'] as String?,
+      publishedDate:
+          json['published_date'] == null
+              ? null
+              : DateTime.parse(json['published_date'] as String),
+    );
+
+Map<String, dynamic> _$SnScrappedLinkToJson(_SnScrappedLink instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'url': instance.url,
+      'title': instance.title,
+      'description': instance.description,
+      'image_url': instance.imageUrl,
+      'favicon_url': instance.faviconUrl,
+      'site_name': instance.siteName,
+      'content_type': instance.contentType,
+      'author': instance.author,
+      'published_date': instance.publishedDate?.toIso8601String(),
+    };

lib/models/file.dart

@@ -14,6 +14,9 @@ sealed class UniversalFile with _$UniversalFile {
     required UniversalFileType type,
   }) = _UniversalFile;
 
+  factory UniversalFile.fromJson(Map<String, dynamic> json) =>
+      _$UniversalFileFromJson(json);
+
   bool get isOnCloud => data is SnCloudFile;
   bool get isOnDevice => !isOnCloud;
 

lib/models/file.freezed.dart

@@ -12,6 +12,7 @@ part of 'file.dart';
 
 // dart format off
 T _$identity<T>(T value) => value;
+
 /// @nodoc
 mixin _$UniversalFile {
 
@@ -22,6 +23,8 @@ mixin _$UniversalFile {
 @pragma('vm:prefer-inline')
 $UniversalFileCopyWith<UniversalFile> get copyWith => _$UniversalFileCopyWithImpl<UniversalFile>(this as UniversalFile, _$identity);
 
+  /// Serializes this UniversalFile to a JSON map.
+  Map<String, dynamic> toJson();
 
 
 @override
@@ -29,7 +32,7 @@ bool operator ==(Object other) {
   return identical(this, other) || (other.runtimeType == runtimeType&&other is UniversalFile&&const DeepCollectionEquality().equals(other.data, data)&&(identical(other.type, type) || other.type == type));
 }
 
-
+@JsonKey(includeFromJson: false, includeToJson: false)
 @override
 int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(data),type);
 
@@ -75,11 +78,11 @@ as UniversalFileType,
 
 
 /// @nodoc
-
+@JsonSerializable()
 
 class _UniversalFile extends UniversalFile {
   const _UniversalFile({required this.data, required this.type}): super._();
-  
+  factory _UniversalFile.fromJson(Map<String, dynamic> json) => _$UniversalFileFromJson(json);
 
 @override final  dynamic data;
 @override final  UniversalFileType type;
@@ -90,14 +93,17 @@ class _UniversalFile extends UniversalFile {
 @pragma('vm:prefer-inline')
 _$UniversalFileCopyWith<_UniversalFile> get copyWith => __$UniversalFileCopyWithImpl<_UniversalFile>(this, _$identity);
 
-
+@override
+Map<String, dynamic> toJson() {
+  return _$UniversalFileToJson(this, );
+}
 
 @override
 bool operator ==(Object other) {
   return identical(this, other) || (other.runtimeType == runtimeType&&other is _UniversalFile&&const DeepCollectionEquality().equals(other.data, data)&&(identical(other.type, type) || other.type == type));
 }
 
-
+@JsonKey(includeFromJson: false, includeToJson: false)
 @override
 int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(data),type);
 

lib/models/file.g.dart

@@ -6,6 +6,25 @@ part of 'file.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
+_UniversalFile _$UniversalFileFromJson(Map<String, dynamic> json) =>
+    _UniversalFile(
+      data: json['data'],
+      type: $enumDecode(_$UniversalFileTypeEnumMap, json['type']),
+    );
+
+Map<String, dynamic> _$UniversalFileToJson(_UniversalFile instance) =>
+    <String, dynamic>{
+      'data': instance.data,
+      'type': _$UniversalFileTypeEnumMap[instance.type]!,
+    };
+
+const _$UniversalFileTypeEnumMap = {
+  UniversalFileType.image: 'image',
+  UniversalFileType.video: 'video',
+  UniversalFileType.audio: 'audio',
+  UniversalFileType.file: 'file',
+};
+
 _SnCloudFile _$SnCloudFileFromJson(Map<String, dynamic> json) => _SnCloudFile(
   id: json['id'] as String,
   name: json['name'] as String,

lib/models/post.dart

@@ -1,5 +1,7 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:island/models/file.dart';
+import 'package:island/models/post_category.dart';
+import 'package:island/models/post_tag.dart';
 import 'package:island/models/user.dart';
 
 part 'post.freezed.dart';
@@ -9,36 +11,37 @@ part 'post.g.dart';
 sealed class SnPost with _$SnPost {
   const factory SnPost({
     required String id,
-    required String? title,
-    required String? description,
-    required String? language,
-    required DateTime? editedAt,
-    required DateTime publishedAt,
-    required int visibility,
-    required String? content,
-    required int type,
-    required Map<String, dynamic>? meta,
-    required int viewsUnique,
-    required int viewsTotal,
-    required int upvotes,
-    required int downvotes,
-    required int repliesCount,
-    required String? threadedPostId,
-    required SnPost? threadedPost,
-    required String? repliedPostId,
-    required SnPost? repliedPost,
-    required String? forwardedPostId,
-    required SnPost? forwardedPost,
-    required List<SnCloudFile> attachments,
-    required SnPublisher publisher,
+    String? title,
+    String? description,
+    String? language,
+    DateTime? editedAt,
+    @Default(null) DateTime? publishedAt,
+    @Default(0) int visibility,
+    String? content,
+    @Default(0) int type,
+    Map<String, dynamic>? meta,
+    @Default(0) int viewsUnique,
+    @Default(0) int viewsTotal,
+    @Default(0) int upvotes,
+    @Default(0) int downvotes,
+    @Default(0) int repliesCount,
+    String? threadedPostId,
+    SnPost? threadedPost,
+    String? repliedPostId,
+    SnPost? repliedPost,
+    String? forwardedPostId,
+    SnPost? forwardedPost,
+    @Default([]) List<SnCloudFile> attachments,
+    @Default(SnPublisher()) SnPublisher publisher,
     @Default({}) Map<String, int> reactionsCount,
-    required List<dynamic> reactions,
-    required List<dynamic> tags,
-    required List<dynamic> categories,
-    required List<dynamic> collections,
-    required DateTime createdAt,
-    required DateTime updatedAt,
-    required DateTime? deletedAt,
+    @Default([]) List<dynamic> reactions,
+    @Default([]) List<PostTag> tags,
+    @Default([]) List<PostCategory> categories,
+    @Default([]) List<dynamic> collections,
+    @Default(null) DateTime? createdAt,
+    @Default(null) DateTime? updatedAt,
+    DateTime? deletedAt,
+    @Default(false) bool isTruncated,
   }) = _SnPost;
 
   factory SnPost.fromJson(Map<String, dynamic> json) => _$SnPostFromJson(json);
@@ -47,20 +50,20 @@ sealed class SnPost with _$SnPost {
 @freezed
 sealed class SnPublisher with _$SnPublisher {
   const factory SnPublisher({
-    required String id,
-    required int type,
-    required String name,
-    required String nick,
+    @Default('') String id,
+    @Default(0) int type,
+    @Default('') String name,
+    @Default('') String nick,
     @Default('') String bio,
-    required SnCloudFile? picture,
-    required SnCloudFile? background,
-    required SnAccount? account,
-    required String? accountId,
-    required DateTime createdAt,
-    required DateTime updatedAt,
-    required DateTime? deletedAt,
-    required String? realmId,
-    required SnVerificationMark? verification,
+    SnCloudFile? picture,
+    SnCloudFile? background,
+    SnAccount? account,
+    String? accountId,
+    @Default(null) DateTime? createdAt,
+    @Default(null) DateTime? updatedAt,
+    DateTime? deletedAt,
+    String? realmId,
+    SnVerificationMark? verification,
   }) = _SnPublisher;
 
   factory SnPublisher.fromJson(Map<String, dynamic> json) =>
@@ -85,7 +88,7 @@ sealed class SnPublisherStats with _$SnPublisherStats {
 sealed class SnSubscriptionStatus with _$SnSubscriptionStatus {
   const factory SnSubscriptionStatus({
     required bool isSubscribed,
-    required int publisherId,
+    required String publisherId,
     required String publisherName,
   }) = _SnSubscriptionStatus;
 

lib/models/post.freezed.dart

@@ -16,7 +16,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$SnPost {
 
- String get id; String? get title; String? get description; String? get language; DateTime? get editedAt; DateTime get publishedAt; int get visibility; String? get content; int get type; Map<String, dynamic>? get meta; int get viewsUnique; int get viewsTotal; int get upvotes; int get downvotes; int get repliesCount; String? get threadedPostId; SnPost? get threadedPost; String? get repliedPostId; SnPost? get repliedPost; String? get forwardedPostId; SnPost? get forwardedPost; List<SnCloudFile> get attachments; SnPublisher get publisher; Map<String, int> get reactionsCount; List<dynamic> get reactions; List<dynamic> get tags; List<dynamic> get categories; List<dynamic> get collections; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ String get id; String? get title; String? get description; String? get language; DateTime? get editedAt; DateTime? get publishedAt; int get visibility; String? get content; int get type; Map<String, dynamic>? get meta; int get viewsUnique; int get viewsTotal; int get upvotes; int get downvotes; int get repliesCount; String? get threadedPostId; SnPost? get threadedPost; String? get repliedPostId; SnPost? get repliedPost; String? get forwardedPostId; SnPost? get forwardedPost; List<SnCloudFile> get attachments; SnPublisher get publisher; Map<String, int> get reactionsCount; List<dynamic> get reactions; List<PostTag> get tags; List<PostCategory> get categories; List<dynamic> get collections; DateTime? get createdAt; DateTime? get updatedAt; DateTime? get deletedAt; bool get isTruncated;
 /// Create a copy of SnPost
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -29,16 +29,16 @@ $SnPostCopyWith<SnPost> get copyWith => _$SnPostCopyWithImpl<SnPost>(this as SnP
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPost&&(identical(other.id, id) || other.id == id)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.language, language) || other.language == language)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&(identical(other.publishedAt, publishedAt) || other.publishedAt == publishedAt)&&(identical(other.visibility, visibility) || other.visibility == visibility)&&(identical(other.content, content) || other.content == content)&&(identical(other.type, type) || other.type == type)&&const DeepCollectionEquality().equals(other.meta, meta)&&(identical(other.viewsUnique, viewsUnique) || other.viewsUnique == viewsUnique)&&(identical(other.viewsTotal, viewsTotal) || other.viewsTotal == viewsTotal)&&(identical(other.upvotes, upvotes) || other.upvotes == upvotes)&&(identical(other.downvotes, downvotes) || other.downvotes == downvotes)&&(identical(other.repliesCount, repliesCount) || other.repliesCount == repliesCount)&&(identical(other.threadedPostId, threadedPostId) || other.threadedPostId == threadedPostId)&&(identical(other.threadedPost, threadedPost) || other.threadedPost == threadedPost)&&(identical(other.repliedPostId, repliedPostId) || other.repliedPostId == repliedPostId)&&(identical(other.repliedPost, repliedPost) || other.repliedPost == repliedPost)&&(identical(other.forwardedPostId, forwardedPostId) || other.forwardedPostId == forwardedPostId)&&(identical(other.forwardedPost, forwardedPost) || other.forwardedPost == forwardedPost)&&const DeepCollectionEquality().equals(other.attachments, attachments)&&(identical(other.publisher, publisher) || other.publisher == publisher)&&const DeepCollectionEquality().equals(other.reactionsCount, reactionsCount)&&const DeepCollectionEquality().equals(other.reactions, reactions)&&const DeepCollectionEquality().equals(other.tags, tags)&&const DeepCollectionEquality().equals(other.categories, categories)&&const DeepCollectionEquality().equals(other.collections, collections)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPost&&(identical(other.id, id) || other.id == id)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.language, language) || other.language == language)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&(identical(other.publishedAt, publishedAt) || other.publishedAt == publishedAt)&&(identical(other.visibility, visibility) || other.visibility == visibility)&&(identical(other.content, content) || other.content == content)&&(identical(other.type, type) || other.type == type)&&const DeepCollectionEquality().equals(other.meta, meta)&&(identical(other.viewsUnique, viewsUnique) || other.viewsUnique == viewsUnique)&&(identical(other.viewsTotal, viewsTotal) || other.viewsTotal == viewsTotal)&&(identical(other.upvotes, upvotes) || other.upvotes == upvotes)&&(identical(other.downvotes, downvotes) || other.downvotes == downvotes)&&(identical(other.repliesCount, repliesCount) || other.repliesCount == repliesCount)&&(identical(other.threadedPostId, threadedPostId) || other.threadedPostId == threadedPostId)&&(identical(other.threadedPost, threadedPost) || other.threadedPost == threadedPost)&&(identical(other.repliedPostId, repliedPostId) || other.repliedPostId == repliedPostId)&&(identical(other.repliedPost, repliedPost) || other.repliedPost == repliedPost)&&(identical(other.forwardedPostId, forwardedPostId) || other.forwardedPostId == forwardedPostId)&&(identical(other.forwardedPost, forwardedPost) || other.forwardedPost == forwardedPost)&&const DeepCollectionEquality().equals(other.attachments, attachments)&&(identical(other.publisher, publisher) || other.publisher == publisher)&&const DeepCollectionEquality().equals(other.reactionsCount, reactionsCount)&&const DeepCollectionEquality().equals(other.reactions, reactions)&&const DeepCollectionEquality().equals(other.tags, tags)&&const DeepCollectionEquality().equals(other.categories, categories)&&const DeepCollectionEquality().equals(other.collections, collections)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.isTruncated, isTruncated) || other.isTruncated == isTruncated));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hashAll([runtimeType,id,title,description,language,editedAt,publishedAt,visibility,content,type,const DeepCollectionEquality().hash(meta),viewsUnique,viewsTotal,upvotes,downvotes,repliesCount,threadedPostId,threadedPost,repliedPostId,repliedPost,forwardedPostId,forwardedPost,const DeepCollectionEquality().hash(attachments),publisher,const DeepCollectionEquality().hash(reactionsCount),const DeepCollectionEquality().hash(reactions),const DeepCollectionEquality().hash(tags),const DeepCollectionEquality().hash(categories),const DeepCollectionEquality().hash(collections),createdAt,updatedAt,deletedAt]);
+int get hashCode => Object.hashAll([runtimeType,id,title,description,language,editedAt,publishedAt,visibility,content,type,const DeepCollectionEquality().hash(meta),viewsUnique,viewsTotal,upvotes,downvotes,repliesCount,threadedPostId,threadedPost,repliedPostId,repliedPost,forwardedPostId,forwardedPost,const DeepCollectionEquality().hash(attachments),publisher,const DeepCollectionEquality().hash(reactionsCount),const DeepCollectionEquality().hash(reactions),const DeepCollectionEquality().hash(tags),const DeepCollectionEquality().hash(categories),const DeepCollectionEquality().hash(collections),createdAt,updatedAt,deletedAt,isTruncated]);
 
 @override
 String toString() {
-  return 'SnPost(id: $id, title: $title, description: $description, language: $language, editedAt: $editedAt, publishedAt: $publishedAt, visibility: $visibility, content: $content, type: $type, meta: $meta, viewsUnique: $viewsUnique, viewsTotal: $viewsTotal, upvotes: $upvotes, downvotes: $downvotes, repliesCount: $repliesCount, threadedPostId: $threadedPostId, threadedPost: $threadedPost, repliedPostId: $repliedPostId, repliedPost: $repliedPost, forwardedPostId: $forwardedPostId, forwardedPost: $forwardedPost, attachments: $attachments, publisher: $publisher, reactionsCount: $reactionsCount, reactions: $reactions, tags: $tags, categories: $categories, collections: $collections, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnPost(id: $id, title: $title, description: $description, language: $language, editedAt: $editedAt, publishedAt: $publishedAt, visibility: $visibility, content: $content, type: $type, meta: $meta, viewsUnique: $viewsUnique, viewsTotal: $viewsTotal, upvotes: $upvotes, downvotes: $downvotes, repliesCount: $repliesCount, threadedPostId: $threadedPostId, threadedPost: $threadedPost, repliedPostId: $repliedPostId, repliedPost: $repliedPost, forwardedPostId: $forwardedPostId, forwardedPost: $forwardedPost, attachments: $attachments, publisher: $publisher, reactionsCount: $reactionsCount, reactions: $reactions, tags: $tags, categories: $categories, collections: $collections, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, isTruncated: $isTruncated)';
 }
 
 
@@ -49,7 +49,7 @@ abstract mixin class $SnPostCopyWith<$Res>  {
   factory $SnPostCopyWith(SnPost value, $Res Function(SnPost) _then) = _$SnPostCopyWithImpl;
 @useResult
 $Res call({
- String id, String? title, String? description, String? language, DateTime? editedAt, DateTime publishedAt, int visibility, String? content, int type, Map<String, dynamic>? meta, int viewsUnique, int viewsTotal, int upvotes, int downvotes, int repliesCount, String? threadedPostId, SnPost? threadedPost, String? repliedPostId, SnPost? repliedPost, String? forwardedPostId, SnPost? forwardedPost, List<SnCloudFile> attachments, SnPublisher publisher, Map<String, int> reactionsCount, List<dynamic> reactions, List<dynamic> tags, List<dynamic> categories, List<dynamic> collections, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String? title, String? description, String? language, DateTime? editedAt, DateTime? publishedAt, int visibility, String? content, int type, Map<String, dynamic>? meta, int viewsUnique, int viewsTotal, int upvotes, int downvotes, int repliesCount, String? threadedPostId, SnPost? threadedPost, String? repliedPostId, SnPost? repliedPost, String? forwardedPostId, SnPost? forwardedPost, List<SnCloudFile> attachments, SnPublisher publisher, Map<String, int> reactionsCount, List<dynamic> reactions, List<PostTag> tags, List<PostCategory> categories, List<dynamic> collections, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt, bool isTruncated
 });
 
 
@@ -66,15 +66,15 @@ class _$SnPostCopyWithImpl<$Res>
 
 /// Create a copy of SnPost
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? title = freezed,Object? description = freezed,Object? language = freezed,Object? editedAt = freezed,Object? publishedAt = null,Object? visibility = null,Object? content = freezed,Object? type = null,Object? meta = freezed,Object? viewsUnique = null,Object? viewsTotal = null,Object? upvotes = null,Object? downvotes = null,Object? repliesCount = null,Object? threadedPostId = freezed,Object? threadedPost = freezed,Object? repliedPostId = freezed,Object? repliedPost = freezed,Object? forwardedPostId = freezed,Object? forwardedPost = freezed,Object? attachments = null,Object? publisher = null,Object? reactionsCount = null,Object? reactions = null,Object? tags = null,Object? categories = null,Object? collections = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? title = freezed,Object? description = freezed,Object? language = freezed,Object? editedAt = freezed,Object? publishedAt = freezed,Object? visibility = null,Object? content = freezed,Object? type = null,Object? meta = freezed,Object? viewsUnique = null,Object? viewsTotal = null,Object? upvotes = null,Object? downvotes = null,Object? repliesCount = null,Object? threadedPostId = freezed,Object? threadedPost = freezed,Object? repliedPostId = freezed,Object? repliedPost = freezed,Object? forwardedPostId = freezed,Object? forwardedPost = freezed,Object? attachments = null,Object? publisher = null,Object? reactionsCount = null,Object? reactions = null,Object? tags = null,Object? categories = null,Object? collections = null,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,Object? isTruncated = null,}) {
   return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,title: freezed == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
 as String?,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
 as String?,language: freezed == language ? _self.language : language // ignore: cast_nullable_to_non_nullable
 as String?,editedAt: freezed == editedAt ? _self.editedAt : editedAt // ignore: cast_nullable_to_non_nullable
-as DateTime?,publishedAt: null == publishedAt ? _self.publishedAt : publishedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,visibility: null == visibility ? _self.visibility : visibility // ignore: cast_nullable_to_non_nullable
+as DateTime?,publishedAt: freezed == publishedAt ? _self.publishedAt : publishedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,visibility: null == visibility ? _self.visibility : visibility // ignore: cast_nullable_to_non_nullable
 as int,content: freezed == content ? _self.content : content // ignore: cast_nullable_to_non_nullable
 as String?,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as int,meta: freezed == meta ? _self.meta : meta // ignore: cast_nullable_to_non_nullable
@@ -94,12 +94,13 @@ as List<SnCloudFile>,publisher: null == publisher ? _self.publisher : publisher
 as SnPublisher,reactionsCount: null == reactionsCount ? _self.reactionsCount : reactionsCount // ignore: cast_nullable_to_non_nullable
 as Map<String, int>,reactions: null == reactions ? _self.reactions : reactions // ignore: cast_nullable_to_non_nullable
 as List<dynamic>,tags: null == tags ? _self.tags : tags // ignore: cast_nullable_to_non_nullable
-as List<dynamic>,categories: null == categories ? _self.categories : categories // ignore: cast_nullable_to_non_nullable
-as List<dynamic>,collections: null == collections ? _self.collections : collections // ignore: cast_nullable_to_non_nullable
-as List<dynamic>,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
-as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
-as DateTime?,
+as List<PostTag>,categories: null == categories ? _self.categories : categories // ignore: cast_nullable_to_non_nullable
+as List<PostCategory>,collections: null == collections ? _self.collections : collections // ignore: cast_nullable_to_non_nullable
+as List<dynamic>,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,isTruncated: null == isTruncated ? _self.isTruncated : isTruncated // ignore: cast_nullable_to_non_nullable
+as bool,
   ));
 }
 /// Create a copy of SnPost
@@ -155,7 +156,7 @@ $SnPublisherCopyWith<$Res> get publisher {
 @JsonSerializable()
 
 class _SnPost implements SnPost {
-  const _SnPost({required this.id, required this.title, required this.description, required this.language, required this.editedAt, required this.publishedAt, required this.visibility, required this.content, required this.type, required final  Map<String, dynamic>? meta, required this.viewsUnique, required this.viewsTotal, required this.upvotes, required this.downvotes, required this.repliesCount, required this.threadedPostId, required this.threadedPost, required this.repliedPostId, required this.repliedPost, required this.forwardedPostId, required this.forwardedPost, required final  List<SnCloudFile> attachments, required this.publisher, final  Map<String, int> reactionsCount = const {}, required final  List<dynamic> reactions, required final  List<dynamic> tags, required final  List<dynamic> categories, required final  List<dynamic> collections, required this.createdAt, required this.updatedAt, required this.deletedAt}): _meta = meta,_attachments = attachments,_reactionsCount = reactionsCount,_reactions = reactions,_tags = tags,_categories = categories,_collections = collections;
+  const _SnPost({required this.id, this.title, this.description, this.language, this.editedAt, this.publishedAt = null, this.visibility = 0, this.content, this.type = 0, final  Map<String, dynamic>? meta, this.viewsUnique = 0, this.viewsTotal = 0, this.upvotes = 0, this.downvotes = 0, this.repliesCount = 0, this.threadedPostId, this.threadedPost, this.repliedPostId, this.repliedPost, this.forwardedPostId, this.forwardedPost, final  List<SnCloudFile> attachments = const [], this.publisher = const SnPublisher(), final  Map<String, int> reactionsCount = const {}, final  List<dynamic> reactions = const [], final  List<PostTag> tags = const [], final  List<PostCategory> categories = const [], final  List<dynamic> collections = const [], this.createdAt = null, this.updatedAt = null, this.deletedAt, this.isTruncated = false}): _meta = meta,_attachments = attachments,_reactionsCount = reactionsCount,_reactions = reactions,_tags = tags,_categories = categories,_collections = collections;
   factory _SnPost.fromJson(Map<String, dynamic> json) => _$SnPostFromJson(json);
 
 @override final  String id;
@@ -163,10 +164,10 @@ class _SnPost implements SnPost {
 @override final  String? description;
 @override final  String? language;
 @override final  DateTime? editedAt;
-@override final  DateTime publishedAt;
-@override final  int visibility;
+@override@JsonKey() final  DateTime? publishedAt;
+@override@JsonKey() final  int visibility;
 @override final  String? content;
-@override final  int type;
+@override@JsonKey() final  int type;
  final  Map<String, dynamic>? _meta;
 @override Map<String, dynamic>? get meta {
   final value = _meta;
@@ -176,11 +177,11 @@ class _SnPost implements SnPost {
   return EqualUnmodifiableMapView(value);
 }
 
-@override final  int viewsUnique;
-@override final  int viewsTotal;
-@override final  int upvotes;
-@override final  int downvotes;
-@override final  int repliesCount;
+@override@JsonKey() final  int viewsUnique;
+@override@JsonKey() final  int viewsTotal;
+@override@JsonKey() final  int upvotes;
+@override@JsonKey() final  int downvotes;
+@override@JsonKey() final  int repliesCount;
 @override final  String? threadedPostId;
 @override final  SnPost? threadedPost;
 @override final  String? repliedPostId;
@@ -188,13 +189,13 @@ class _SnPost implements SnPost {
 @override final  String? forwardedPostId;
 @override final  SnPost? forwardedPost;
  final  List<SnCloudFile> _attachments;
-@override List<SnCloudFile> get attachments {
+@override@JsonKey() List<SnCloudFile> get attachments {
   if (_attachments is EqualUnmodifiableListView) return _attachments;
   // ignore: implicit_dynamic_type
   return EqualUnmodifiableListView(_attachments);
 }
 
-@override final  SnPublisher publisher;
+@override@JsonKey() final  SnPublisher publisher;
  final  Map<String, int> _reactionsCount;
 @override@JsonKey() Map<String, int> get reactionsCount {
   if (_reactionsCount is EqualUnmodifiableMapView) return _reactionsCount;
@@ -203,36 +204,37 @@ class _SnPost implements SnPost {
 }
 
  final  List<dynamic> _reactions;
-@override List<dynamic> get reactions {
+@override@JsonKey() List<dynamic> get reactions {
   if (_reactions is EqualUnmodifiableListView) return _reactions;
   // ignore: implicit_dynamic_type
   return EqualUnmodifiableListView(_reactions);
 }
 
- final  List<dynamic> _tags;
-@override List<dynamic> get tags {
+ final  List<PostTag> _tags;
+@override@JsonKey() List<PostTag> get tags {
   if (_tags is EqualUnmodifiableListView) return _tags;
   // ignore: implicit_dynamic_type
   return EqualUnmodifiableListView(_tags);
 }
 
- final  List<dynamic> _categories;
-@override List<dynamic> get categories {
+ final  List<PostCategory> _categories;
+@override@JsonKey() List<PostCategory> get categories {
   if (_categories is EqualUnmodifiableListView) return _categories;
   // ignore: implicit_dynamic_type
   return EqualUnmodifiableListView(_categories);
 }
 
  final  List<dynamic> _collections;
-@override List<dynamic> get collections {
+@override@JsonKey() List<dynamic> get collections {
   if (_collections is EqualUnmodifiableListView) return _collections;
   // ignore: implicit_dynamic_type
   return EqualUnmodifiableListView(_collections);
 }
 
-@override final  DateTime createdAt;
-@override final  DateTime updatedAt;
+@override@JsonKey() final  DateTime? createdAt;
+@override@JsonKey() final  DateTime? updatedAt;
 @override final  DateTime? deletedAt;
+@override@JsonKey() final  bool isTruncated;
 
 /// Create a copy of SnPost
 /// with the given fields replaced by the non-null parameter values.
@@ -247,16 +249,16 @@ Map<String, dynamic> toJson() {
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPost&&(identical(other.id, id) || other.id == id)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.language, language) || other.language == language)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&(identical(other.publishedAt, publishedAt) || other.publishedAt == publishedAt)&&(identical(other.visibility, visibility) || other.visibility == visibility)&&(identical(other.content, content) || other.content == content)&&(identical(other.type, type) || other.type == type)&&const DeepCollectionEquality().equals(other._meta, _meta)&&(identical(other.viewsUnique, viewsUnique) || other.viewsUnique == viewsUnique)&&(identical(other.viewsTotal, viewsTotal) || other.viewsTotal == viewsTotal)&&(identical(other.upvotes, upvotes) || other.upvotes == upvotes)&&(identical(other.downvotes, downvotes) || other.downvotes == downvotes)&&(identical(other.repliesCount, repliesCount) || other.repliesCount == repliesCount)&&(identical(other.threadedPostId, threadedPostId) || other.threadedPostId == threadedPostId)&&(identical(other.threadedPost, threadedPost) || other.threadedPost == threadedPost)&&(identical(other.repliedPostId, repliedPostId) || other.repliedPostId == repliedPostId)&&(identical(other.repliedPost, repliedPost) || other.repliedPost == repliedPost)&&(identical(other.forwardedPostId, forwardedPostId) || other.forwardedPostId == forwardedPostId)&&(identical(other.forwardedPost, forwardedPost) || other.forwardedPost == forwardedPost)&&const DeepCollectionEquality().equals(other._attachments, _attachments)&&(identical(other.publisher, publisher) || other.publisher == publisher)&&const DeepCollectionEquality().equals(other._reactionsCount, _reactionsCount)&&const DeepCollectionEquality().equals(other._reactions, _reactions)&&const DeepCollectionEquality().equals(other._tags, _tags)&&const DeepCollectionEquality().equals(other._categories, _categories)&&const DeepCollectionEquality().equals(other._collections, _collections)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPost&&(identical(other.id, id) || other.id == id)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.language, language) || other.language == language)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&(identical(other.publishedAt, publishedAt) || other.publishedAt == publishedAt)&&(identical(other.visibility, visibility) || other.visibility == visibility)&&(identical(other.content, content) || other.content == content)&&(identical(other.type, type) || other.type == type)&&const DeepCollectionEquality().equals(other._meta, _meta)&&(identical(other.viewsUnique, viewsUnique) || other.viewsUnique == viewsUnique)&&(identical(other.viewsTotal, viewsTotal) || other.viewsTotal == viewsTotal)&&(identical(other.upvotes, upvotes) || other.upvotes == upvotes)&&(identical(other.downvotes, downvotes) || other.downvotes == downvotes)&&(identical(other.repliesCount, repliesCount) || other.repliesCount == repliesCount)&&(identical(other.threadedPostId, threadedPostId) || other.threadedPostId == threadedPostId)&&(identical(other.threadedPost, threadedPost) || other.threadedPost == threadedPost)&&(identical(other.repliedPostId, repliedPostId) || other.repliedPostId == repliedPostId)&&(identical(other.repliedPost, repliedPost) || other.repliedPost == repliedPost)&&(identical(other.forwardedPostId, forwardedPostId) || other.forwardedPostId == forwardedPostId)&&(identical(other.forwardedPost, forwardedPost) || other.forwardedPost == forwardedPost)&&const DeepCollectionEquality().equals(other._attachments, _attachments)&&(identical(other.publisher, publisher) || other.publisher == publisher)&&const DeepCollectionEquality().equals(other._reactionsCount, _reactionsCount)&&const DeepCollectionEquality().equals(other._reactions, _reactions)&&const DeepCollectionEquality().equals(other._tags, _tags)&&const DeepCollectionEquality().equals(other._categories, _categories)&&const DeepCollectionEquality().equals(other._collections, _collections)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.isTruncated, isTruncated) || other.isTruncated == isTruncated));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hashAll([runtimeType,id,title,description,language,editedAt,publishedAt,visibility,content,type,const DeepCollectionEquality().hash(_meta),viewsUnique,viewsTotal,upvotes,downvotes,repliesCount,threadedPostId,threadedPost,repliedPostId,repliedPost,forwardedPostId,forwardedPost,const DeepCollectionEquality().hash(_attachments),publisher,const DeepCollectionEquality().hash(_reactionsCount),const DeepCollectionEquality().hash(_reactions),const DeepCollectionEquality().hash(_tags),const DeepCollectionEquality().hash(_categories),const DeepCollectionEquality().hash(_collections),createdAt,updatedAt,deletedAt]);
+int get hashCode => Object.hashAll([runtimeType,id,title,description,language,editedAt,publishedAt,visibility,content,type,const DeepCollectionEquality().hash(_meta),viewsUnique,viewsTotal,upvotes,downvotes,repliesCount,threadedPostId,threadedPost,repliedPostId,repliedPost,forwardedPostId,forwardedPost,const DeepCollectionEquality().hash(_attachments),publisher,const DeepCollectionEquality().hash(_reactionsCount),const DeepCollectionEquality().hash(_reactions),const DeepCollectionEquality().hash(_tags),const DeepCollectionEquality().hash(_categories),const DeepCollectionEquality().hash(_collections),createdAt,updatedAt,deletedAt,isTruncated]);
 
 @override
 String toString() {
-  return 'SnPost(id: $id, title: $title, description: $description, language: $language, editedAt: $editedAt, publishedAt: $publishedAt, visibility: $visibility, content: $content, type: $type, meta: $meta, viewsUnique: $viewsUnique, viewsTotal: $viewsTotal, upvotes: $upvotes, downvotes: $downvotes, repliesCount: $repliesCount, threadedPostId: $threadedPostId, threadedPost: $threadedPost, repliedPostId: $repliedPostId, repliedPost: $repliedPost, forwardedPostId: $forwardedPostId, forwardedPost: $forwardedPost, attachments: $attachments, publisher: $publisher, reactionsCount: $reactionsCount, reactions: $reactions, tags: $tags, categories: $categories, collections: $collections, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnPost(id: $id, title: $title, description: $description, language: $language, editedAt: $editedAt, publishedAt: $publishedAt, visibility: $visibility, content: $content, type: $type, meta: $meta, viewsUnique: $viewsUnique, viewsTotal: $viewsTotal, upvotes: $upvotes, downvotes: $downvotes, repliesCount: $repliesCount, threadedPostId: $threadedPostId, threadedPost: $threadedPost, repliedPostId: $repliedPostId, repliedPost: $repliedPost, forwardedPostId: $forwardedPostId, forwardedPost: $forwardedPost, attachments: $attachments, publisher: $publisher, reactionsCount: $reactionsCount, reactions: $reactions, tags: $tags, categories: $categories, collections: $collections, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, isTruncated: $isTruncated)';
 }
 
 
@@ -267,7 +269,7 @@ abstract mixin class _$SnPostCopyWith<$Res> implements $SnPostCopyWith<$Res> {
   factory _$SnPostCopyWith(_SnPost value, $Res Function(_SnPost) _then) = __$SnPostCopyWithImpl;
 @override @useResult
 $Res call({
- String id, String? title, String? description, String? language, DateTime? editedAt, DateTime publishedAt, int visibility, String? content, int type, Map<String, dynamic>? meta, int viewsUnique, int viewsTotal, int upvotes, int downvotes, int repliesCount, String? threadedPostId, SnPost? threadedPost, String? repliedPostId, SnPost? repliedPost, String? forwardedPostId, SnPost? forwardedPost, List<SnCloudFile> attachments, SnPublisher publisher, Map<String, int> reactionsCount, List<dynamic> reactions, List<dynamic> tags, List<dynamic> categories, List<dynamic> collections, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String? title, String? description, String? language, DateTime? editedAt, DateTime? publishedAt, int visibility, String? content, int type, Map<String, dynamic>? meta, int viewsUnique, int viewsTotal, int upvotes, int downvotes, int repliesCount, String? threadedPostId, SnPost? threadedPost, String? repliedPostId, SnPost? repliedPost, String? forwardedPostId, SnPost? forwardedPost, List<SnCloudFile> attachments, SnPublisher publisher, Map<String, int> reactionsCount, List<dynamic> reactions, List<PostTag> tags, List<PostCategory> categories, List<dynamic> collections, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt, bool isTruncated
 });
 
 
@@ -284,15 +286,15 @@ class __$SnPostCopyWithImpl<$Res>
 
 /// Create a copy of SnPost
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? title = freezed,Object? description = freezed,Object? language = freezed,Object? editedAt = freezed,Object? publishedAt = null,Object? visibility = null,Object? content = freezed,Object? type = null,Object? meta = freezed,Object? viewsUnique = null,Object? viewsTotal = null,Object? upvotes = null,Object? downvotes = null,Object? repliesCount = null,Object? threadedPostId = freezed,Object? threadedPost = freezed,Object? repliedPostId = freezed,Object? repliedPost = freezed,Object? forwardedPostId = freezed,Object? forwardedPost = freezed,Object? attachments = null,Object? publisher = null,Object? reactionsCount = null,Object? reactions = null,Object? tags = null,Object? categories = null,Object? collections = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? title = freezed,Object? description = freezed,Object? language = freezed,Object? editedAt = freezed,Object? publishedAt = freezed,Object? visibility = null,Object? content = freezed,Object? type = null,Object? meta = freezed,Object? viewsUnique = null,Object? viewsTotal = null,Object? upvotes = null,Object? downvotes = null,Object? repliesCount = null,Object? threadedPostId = freezed,Object? threadedPost = freezed,Object? repliedPostId = freezed,Object? repliedPost = freezed,Object? forwardedPostId = freezed,Object? forwardedPost = freezed,Object? attachments = null,Object? publisher = null,Object? reactionsCount = null,Object? reactions = null,Object? tags = null,Object? categories = null,Object? collections = null,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,Object? isTruncated = null,}) {
   return _then(_SnPost(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,title: freezed == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
 as String?,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
 as String?,language: freezed == language ? _self.language : language // ignore: cast_nullable_to_non_nullable
 as String?,editedAt: freezed == editedAt ? _self.editedAt : editedAt // ignore: cast_nullable_to_non_nullable
-as DateTime?,publishedAt: null == publishedAt ? _self.publishedAt : publishedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,visibility: null == visibility ? _self.visibility : visibility // ignore: cast_nullable_to_non_nullable
+as DateTime?,publishedAt: freezed == publishedAt ? _self.publishedAt : publishedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,visibility: null == visibility ? _self.visibility : visibility // ignore: cast_nullable_to_non_nullable
 as int,content: freezed == content ? _self.content : content // ignore: cast_nullable_to_non_nullable
 as String?,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as int,meta: freezed == meta ? _self._meta : meta // ignore: cast_nullable_to_non_nullable
@@ -312,12 +314,13 @@ as List<SnCloudFile>,publisher: null == publisher ? _self.publisher : publisher
 as SnPublisher,reactionsCount: null == reactionsCount ? _self._reactionsCount : reactionsCount // ignore: cast_nullable_to_non_nullable
 as Map<String, int>,reactions: null == reactions ? _self._reactions : reactions // ignore: cast_nullable_to_non_nullable
 as List<dynamic>,tags: null == tags ? _self._tags : tags // ignore: cast_nullable_to_non_nullable
-as List<dynamic>,categories: null == categories ? _self._categories : categories // ignore: cast_nullable_to_non_nullable
-as List<dynamic>,collections: null == collections ? _self._collections : collections // ignore: cast_nullable_to_non_nullable
-as List<dynamic>,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
-as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
-as DateTime?,
+as List<PostTag>,categories: null == categories ? _self._categories : categories // ignore: cast_nullable_to_non_nullable
+as List<PostCategory>,collections: null == collections ? _self._collections : collections // ignore: cast_nullable_to_non_nullable
+as List<dynamic>,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,isTruncated: null == isTruncated ? _self.isTruncated : isTruncated // ignore: cast_nullable_to_non_nullable
+as bool,
   ));
 }
 
@@ -373,7 +376,7 @@ $SnPublisherCopyWith<$Res> get publisher {
 /// @nodoc
 mixin _$SnPublisher {
 
- String get id; int get type; String get name; String get nick; String get bio; SnCloudFile? get picture; SnCloudFile? get background; SnAccount? get account; String? get accountId; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt; String? get realmId; SnVerificationMark? get verification;
+ String get id; int get type; String get name; String get nick; String get bio; SnCloudFile? get picture; SnCloudFile? get background; SnAccount? get account; String? get accountId; DateTime? get createdAt; DateTime? get updatedAt; DateTime? get deletedAt; String? get realmId; SnVerificationMark? get verification;
 /// Create a copy of SnPublisher
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -406,7 +409,7 @@ abstract mixin class $SnPublisherCopyWith<$Res>  {
   factory $SnPublisherCopyWith(SnPublisher value, $Res Function(SnPublisher) _then) = _$SnPublisherCopyWithImpl;
 @useResult
 $Res call({
- String id, int type, String name, String nick, String bio, SnCloudFile? picture, SnCloudFile? background, SnAccount? account, String? accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, String? realmId, SnVerificationMark? verification
+ String id, int type, String name, String nick, String bio, SnCloudFile? picture, SnCloudFile? background, SnAccount? account, String? accountId, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt, String? realmId, SnVerificationMark? verification
 });
 
 
@@ -423,7 +426,7 @@ class _$SnPublisherCopyWithImpl<$Res>
 
 /// Create a copy of SnPublisher
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? type = null,Object? name = null,Object? nick = null,Object? bio = null,Object? picture = freezed,Object? background = freezed,Object? account = freezed,Object? accountId = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? realmId = freezed,Object? verification = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? type = null,Object? name = null,Object? nick = null,Object? bio = null,Object? picture = freezed,Object? background = freezed,Object? account = freezed,Object? accountId = freezed,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,Object? realmId = freezed,Object? verification = freezed,}) {
   return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
@@ -434,9 +437,9 @@ as String,picture: freezed == picture ? _self.picture : picture // ignore: cast_
 as SnCloudFile?,background: freezed == background ? _self.background : background // ignore: cast_nullable_to_non_nullable
 as SnCloudFile?,account: freezed == account ? _self.account : account // ignore: cast_nullable_to_non_nullable
 as SnAccount?,accountId: freezed == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
-as String?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
-as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as String?,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,realmId: freezed == realmId ? _self.realmId : realmId // ignore: cast_nullable_to_non_nullable
 as String?,verification: freezed == verification ? _self.verification : verification // ignore: cast_nullable_to_non_nullable
 as SnVerificationMark?,
@@ -498,20 +501,20 @@ $SnVerificationMarkCopyWith<$Res>? get verification {
 @JsonSerializable()
 
 class _SnPublisher implements SnPublisher {
-  const _SnPublisher({required this.id, required this.type, required this.name, required this.nick, this.bio = '', required this.picture, required this.background, required this.account, required this.accountId, required this.createdAt, required this.updatedAt, required this.deletedAt, required this.realmId, required this.verification});
+  const _SnPublisher({this.id = '', this.type = 0, this.name = '', this.nick = '', this.bio = '', this.picture, this.background, this.account, this.accountId, this.createdAt = null, this.updatedAt = null, this.deletedAt, this.realmId, this.verification});
   factory _SnPublisher.fromJson(Map<String, dynamic> json) => _$SnPublisherFromJson(json);
 
-@override final  String id;
-@override final  int type;
-@override final  String name;
-@override final  String nick;
+@override@JsonKey() final  String id;
+@override@JsonKey() final  int type;
+@override@JsonKey() final  String name;
+@override@JsonKey() final  String nick;
 @override@JsonKey() final  String bio;
 @override final  SnCloudFile? picture;
 @override final  SnCloudFile? background;
 @override final  SnAccount? account;
 @override final  String? accountId;
-@override final  DateTime createdAt;
-@override final  DateTime updatedAt;
+@override@JsonKey() final  DateTime? createdAt;
+@override@JsonKey() final  DateTime? updatedAt;
 @override final  DateTime? deletedAt;
 @override final  String? realmId;
 @override final  SnVerificationMark? verification;
@@ -549,7 +552,7 @@ abstract mixin class _$SnPublisherCopyWith<$Res> implements $SnPublisherCopyWith
   factory _$SnPublisherCopyWith(_SnPublisher value, $Res Function(_SnPublisher) _then) = __$SnPublisherCopyWithImpl;
 @override @useResult
 $Res call({
- String id, int type, String name, String nick, String bio, SnCloudFile? picture, SnCloudFile? background, SnAccount? account, String? accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, String? realmId, SnVerificationMark? verification
+ String id, int type, String name, String nick, String bio, SnCloudFile? picture, SnCloudFile? background, SnAccount? account, String? accountId, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt, String? realmId, SnVerificationMark? verification
 });
 
 
@@ -566,7 +569,7 @@ class __$SnPublisherCopyWithImpl<$Res>
 
 /// Create a copy of SnPublisher
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? type = null,Object? name = null,Object? nick = null,Object? bio = null,Object? picture = freezed,Object? background = freezed,Object? account = freezed,Object? accountId = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? realmId = freezed,Object? verification = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? type = null,Object? name = null,Object? nick = null,Object? bio = null,Object? picture = freezed,Object? background = freezed,Object? account = freezed,Object? accountId = freezed,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,Object? realmId = freezed,Object? verification = freezed,}) {
   return _then(_SnPublisher(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
@@ -577,9 +580,9 @@ as String,picture: freezed == picture ? _self.picture : picture // ignore: cast_
 as SnCloudFile?,background: freezed == background ? _self.background : background // ignore: cast_nullable_to_non_nullable
 as SnCloudFile?,account: freezed == account ? _self.account : account // ignore: cast_nullable_to_non_nullable
 as SnAccount?,accountId: freezed == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
-as String?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
-as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as String?,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,realmId: freezed == realmId ? _self.realmId : realmId // ignore: cast_nullable_to_non_nullable
 as String?,verification: freezed == verification ? _self.verification : verification // ignore: cast_nullable_to_non_nullable
 as SnVerificationMark?,
@@ -786,7 +789,7 @@ as int,
 /// @nodoc
 mixin _$SnSubscriptionStatus {
 
- bool get isSubscribed; int get publisherId; String get publisherName;
+ bool get isSubscribed; String get publisherId; String get publisherName;
 /// Create a copy of SnSubscriptionStatus
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -819,7 +822,7 @@ abstract mixin class $SnSubscriptionStatusCopyWith<$Res>  {
   factory $SnSubscriptionStatusCopyWith(SnSubscriptionStatus value, $Res Function(SnSubscriptionStatus) _then) = _$SnSubscriptionStatusCopyWithImpl;
 @useResult
 $Res call({
- bool isSubscribed, int publisherId, String publisherName
+ bool isSubscribed, String publisherId, String publisherName
 });
 
 
@@ -840,7 +843,7 @@ class _$SnSubscriptionStatusCopyWithImpl<$Res>
   return _then(_self.copyWith(
 isSubscribed: null == isSubscribed ? _self.isSubscribed : isSubscribed // ignore: cast_nullable_to_non_nullable
 as bool,publisherId: null == publisherId ? _self.publisherId : publisherId // ignore: cast_nullable_to_non_nullable
-as int,publisherName: null == publisherName ? _self.publisherName : publisherName // ignore: cast_nullable_to_non_nullable
+as String,publisherName: null == publisherName ? _self.publisherName : publisherName // ignore: cast_nullable_to_non_nullable
 as String,
   ));
 }
@@ -856,7 +859,7 @@ class _SnSubscriptionStatus implements SnSubscriptionStatus {
   factory _SnSubscriptionStatus.fromJson(Map<String, dynamic> json) => _$SnSubscriptionStatusFromJson(json);
 
 @override final  bool isSubscribed;
-@override final  int publisherId;
+@override final  String publisherId;
 @override final  String publisherName;
 
 /// Create a copy of SnSubscriptionStatus
@@ -892,7 +895,7 @@ abstract mixin class _$SnSubscriptionStatusCopyWith<$Res> implements $SnSubscrip
   factory _$SnSubscriptionStatusCopyWith(_SnSubscriptionStatus value, $Res Function(_SnSubscriptionStatus) _then) = __$SnSubscriptionStatusCopyWithImpl;
 @override @useResult
 $Res call({
- bool isSubscribed, int publisherId, String publisherName
+ bool isSubscribed, String publisherId, String publisherName
 });
 
 
@@ -913,7 +916,7 @@ class __$SnSubscriptionStatusCopyWithImpl<$Res>
   return _then(_SnSubscriptionStatus(
 isSubscribed: null == isSubscribed ? _self.isSubscribed : isSubscribed // ignore: cast_nullable_to_non_nullable
 as bool,publisherId: null == publisherId ? _self.publisherId : publisherId // ignore: cast_nullable_to_non_nullable
-as int,publisherName: null == publisherName ? _self.publisherName : publisherName // ignore: cast_nullable_to_non_nullable
+as String,publisherName: null == publisherName ? _self.publisherName : publisherName // ignore: cast_nullable_to_non_nullable
 as String,
   ));
 }

lib/models/post.g.dart

@@ -15,16 +15,19 @@ _SnPost _$SnPostFromJson(Map<String, dynamic> json) => _SnPost(
       json['edited_at'] == null
           ? null
           : DateTime.parse(json['edited_at'] as String),
-  publishedAt: DateTime.parse(json['published_at'] as String),
-  visibility: (json['visibility'] as num).toInt(),
+  publishedAt:
+      json['published_at'] == null
+          ? null
+          : DateTime.parse(json['published_at'] as String),
+  visibility: (json['visibility'] as num?)?.toInt() ?? 0,
   content: json['content'] as String?,
-  type: (json['type'] as num).toInt(),
+  type: (json['type'] as num?)?.toInt() ?? 0,
   meta: json['meta'] as Map<String, dynamic>?,
-  viewsUnique: (json['views_unique'] as num).toInt(),
-  viewsTotal: (json['views_total'] as num).toInt(),
-  upvotes: (json['upvotes'] as num).toInt(),
-  downvotes: (json['downvotes'] as num).toInt(),
-  repliesCount: (json['replies_count'] as num).toInt(),
+  viewsUnique: (json['views_unique'] as num?)?.toInt() ?? 0,
+  viewsTotal: (json['views_total'] as num?)?.toInt() ?? 0,
+  upvotes: (json['upvotes'] as num?)?.toInt() ?? 0,
+  downvotes: (json['downvotes'] as num?)?.toInt() ?? 0,
+  repliesCount: (json['replies_count'] as num?)?.toInt() ?? 0,
   threadedPostId: json['threaded_post_id'] as String?,
   threadedPost:
       json['threaded_post'] == null
@@ -41,25 +44,44 @@ _SnPost _$SnPostFromJson(Map<String, dynamic> json) => _SnPost(
           ? null
           : SnPost.fromJson(json['forwarded_post'] as Map<String, dynamic>),
   attachments:
-      (json['attachments'] as List<dynamic>)
-          .map((e) => SnCloudFile.fromJson(e as Map<String, dynamic>))
-          .toList(),
-  publisher: SnPublisher.fromJson(json['publisher'] as Map<String, dynamic>),
+      (json['attachments'] as List<dynamic>?)
+          ?.map((e) => SnCloudFile.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      const [],
+  publisher:
+      json['publisher'] == null
+          ? const SnPublisher()
+          : SnPublisher.fromJson(json['publisher'] as Map<String, dynamic>),
   reactionsCount:
       (json['reactions_count'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, (e as num).toInt()),
       ) ??
       const {},
-  reactions: json['reactions'] as List<dynamic>,
-  tags: json['tags'] as List<dynamic>,
-  categories: json['categories'] as List<dynamic>,
-  collections: json['collections'] as List<dynamic>,
-  createdAt: DateTime.parse(json['created_at'] as String),
-  updatedAt: DateTime.parse(json['updated_at'] as String),
+  reactions: json['reactions'] as List<dynamic>? ?? const [],
+  tags:
+      (json['tags'] as List<dynamic>?)
+          ?.map((e) => PostTag.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      const [],
+  categories:
+      (json['categories'] as List<dynamic>?)
+          ?.map((e) => PostCategory.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      const [],
+  collections: json['collections'] as List<dynamic>? ?? const [],
+  createdAt:
+      json['created_at'] == null
+          ? null
+          : DateTime.parse(json['created_at'] as String),
+  updatedAt:
+      json['updated_at'] == null
+          ? null
+          : DateTime.parse(json['updated_at'] as String),
   deletedAt:
       json['deleted_at'] == null
           ? null
           : DateTime.parse(json['deleted_at'] as String),
+  isTruncated: json['is_truncated'] as bool? ?? false,
 );
 
 Map<String, dynamic> _$SnPostToJson(_SnPost instance) => <String, dynamic>{
@@ -68,7 +90,7 @@ Map<String, dynamic> _$SnPostToJson(_SnPost instance) => <String, dynamic>{
   'description': instance.description,
   'language': instance.language,
   'edited_at': instance.editedAt?.toIso8601String(),
-  'published_at': instance.publishedAt.toIso8601String(),
+  'published_at': instance.publishedAt?.toIso8601String(),
   'visibility': instance.visibility,
   'content': instance.content,
   'type': instance.type,
@@ -88,19 +110,20 @@ Map<String, dynamic> _$SnPostToJson(_SnPost instance) => <String, dynamic>{
   'publisher': instance.publisher.toJson(),
   'reactions_count': instance.reactionsCount,
   'reactions': instance.reactions,
-  'tags': instance.tags,
-  'categories': instance.categories,
+  'tags': instance.tags.map((e) => e.toJson()).toList(),
+  'categories': instance.categories.map((e) => e.toJson()).toList(),
   'collections': instance.collections,
-  'created_at': instance.createdAt.toIso8601String(),
-  'updated_at': instance.updatedAt.toIso8601String(),
+  'created_at': instance.createdAt?.toIso8601String(),
+  'updated_at': instance.updatedAt?.toIso8601String(),
   'deleted_at': instance.deletedAt?.toIso8601String(),
+  'is_truncated': instance.isTruncated,
 };
 
 _SnPublisher _$SnPublisherFromJson(Map<String, dynamic> json) => _SnPublisher(
-  id: json['id'] as String,
-  type: (json['type'] as num).toInt(),
-  name: json['name'] as String,
-  nick: json['nick'] as String,
+  id: json['id'] as String? ?? '',
+  type: (json['type'] as num?)?.toInt() ?? 0,
+  name: json['name'] as String? ?? '',
+  nick: json['nick'] as String? ?? '',
   bio: json['bio'] as String? ?? '',
   picture:
       json['picture'] == null
@@ -115,8 +138,14 @@ _SnPublisher _$SnPublisherFromJson(Map<String, dynamic> json) => _SnPublisher(
           ? null
           : SnAccount.fromJson(json['account'] as Map<String, dynamic>),
   accountId: json['account_id'] as String?,
-  createdAt: DateTime.parse(json['created_at'] as String),
-  updatedAt: DateTime.parse(json['updated_at'] as String),
+  createdAt:
+      json['created_at'] == null
+          ? null
+          : DateTime.parse(json['created_at'] as String),
+  updatedAt:
+      json['updated_at'] == null
+          ? null
+          : DateTime.parse(json['updated_at'] as String),
   deletedAt:
       json['deleted_at'] == null
           ? null
@@ -141,8 +170,8 @@ Map<String, dynamic> _$SnPublisherToJson(_SnPublisher instance) =>
       'background': instance.background?.toJson(),
       'account': instance.account?.toJson(),
       'account_id': instance.accountId,
-      'created_at': instance.createdAt.toIso8601String(),
-      'updated_at': instance.updatedAt.toIso8601String(),
+      'created_at': instance.createdAt?.toIso8601String(),
+      'updated_at': instance.updatedAt?.toIso8601String(),
       'deleted_at': instance.deletedAt?.toIso8601String(),
       'realm_id': instance.realmId,
       'verification': instance.verification?.toJson(),
@@ -170,7 +199,7 @@ _SnSubscriptionStatus _$SnSubscriptionStatusFromJson(
   Map<String, dynamic> json,
 ) => _SnSubscriptionStatus(
   isSubscribed: json['is_subscribed'] as bool,
-  publisherId: (json['publisher_id'] as num).toInt(),
+  publisherId: json['publisher_id'] as String,
   publisherName: json['publisher_name'] as String,
 );
 

lib/models/post_category.dart

@@ -0,0 +1,19 @@
+
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:island/models/post.dart';
+
+part 'post_category.freezed.dart';
+part 'post_category.g.dart';
+
+@freezed
+sealed class PostCategory with _$PostCategory {
+  const factory PostCategory({
+    required String id,
+    required String slug,
+    String? name,
+    @Default([]) List<SnPost> posts,
+  }) = _PostCategory;
+
+  factory PostCategory.fromJson(Map<String, dynamic> json) =>
+      _$PostCategoryFromJson(json);
+}

lib/models/post_category.freezed.dart

@@ -0,0 +1,163 @@
+// dart format width=80
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'post_category.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$PostCategory {
+
+ String get id; String get slug; String? get name; List<SnPost> get posts;
+/// Create a copy of PostCategory
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$PostCategoryCopyWith<PostCategory> get copyWith => _$PostCategoryCopyWithImpl<PostCategory>(this as PostCategory, _$identity);
+
+  /// Serializes this PostCategory to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is PostCategory&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.name, name) || other.name == name)&&const DeepCollectionEquality().equals(other.posts, posts));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,slug,name,const DeepCollectionEquality().hash(posts));
+
+@override
+String toString() {
+  return 'PostCategory(id: $id, slug: $slug, name: $name, posts: $posts)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $PostCategoryCopyWith<$Res>  {
+  factory $PostCategoryCopyWith(PostCategory value, $Res Function(PostCategory) _then) = _$PostCategoryCopyWithImpl;
+@useResult
+$Res call({
+ String id, String slug, String? name, List<SnPost> posts
+});
+
+
+
+
+}
+/// @nodoc
+class _$PostCategoryCopyWithImpl<$Res>
+    implements $PostCategoryCopyWith<$Res> {
+  _$PostCategoryCopyWithImpl(this._self, this._then);
+
+  final PostCategory _self;
+  final $Res Function(PostCategory) _then;
+
+/// Create a copy of PostCategory
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? slug = null,Object? name = freezed,Object? posts = null,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,slug: null == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
+as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String?,posts: null == posts ? _self.posts : posts // ignore: cast_nullable_to_non_nullable
+as List<SnPost>,
+  ));
+}
+
+}
+
+
+/// @nodoc
+@JsonSerializable()
+
+class _PostCategory implements PostCategory {
+  const _PostCategory({required this.id, required this.slug, this.name, final  List<SnPost> posts = const []}): _posts = posts;
+  factory _PostCategory.fromJson(Map<String, dynamic> json) => _$PostCategoryFromJson(json);
+
+@override final  String id;
+@override final  String slug;
+@override final  String? name;
+ final  List<SnPost> _posts;
+@override@JsonKey() List<SnPost> get posts {
+  if (_posts is EqualUnmodifiableListView) return _posts;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableListView(_posts);
+}
+
+
+/// Create a copy of PostCategory
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$PostCategoryCopyWith<_PostCategory> get copyWith => __$PostCategoryCopyWithImpl<_PostCategory>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$PostCategoryToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _PostCategory&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.name, name) || other.name == name)&&const DeepCollectionEquality().equals(other._posts, _posts));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,slug,name,const DeepCollectionEquality().hash(_posts));
+
+@override
+String toString() {
+  return 'PostCategory(id: $id, slug: $slug, name: $name, posts: $posts)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$PostCategoryCopyWith<$Res> implements $PostCategoryCopyWith<$Res> {
+  factory _$PostCategoryCopyWith(_PostCategory value, $Res Function(_PostCategory) _then) = __$PostCategoryCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String slug, String? name, List<SnPost> posts
+});
+
+
+
+
+}
+/// @nodoc
+class __$PostCategoryCopyWithImpl<$Res>
+    implements _$PostCategoryCopyWith<$Res> {
+  __$PostCategoryCopyWithImpl(this._self, this._then);
+
+  final _PostCategory _self;
+  final $Res Function(_PostCategory) _then;
+
+/// Create a copy of PostCategory
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? slug = null,Object? name = freezed,Object? posts = null,}) {
+  return _then(_PostCategory(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,slug: null == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
+as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String?,posts: null == posts ? _self._posts : posts // ignore: cast_nullable_to_non_nullable
+as List<SnPost>,
+  ));
+}
+
+
+}
+
+// dart format on

lib/models/post_category.g.dart

@@ -0,0 +1,27 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'post_category.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_PostCategory _$PostCategoryFromJson(Map<String, dynamic> json) =>
+    _PostCategory(
+      id: json['id'] as String,
+      slug: json['slug'] as String,
+      name: json['name'] as String?,
+      posts:
+          (json['posts'] as List<dynamic>?)
+              ?.map((e) => SnPost.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          const [],
+    );
+
+Map<String, dynamic> _$PostCategoryToJson(_PostCategory instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'slug': instance.slug,
+      'name': instance.name,
+      'posts': instance.posts.map((e) => e.toJson()).toList(),
+    };

lib/models/post_tag.dart

@@ -0,0 +1,19 @@
+
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:island/models/post.dart';
+
+part 'post_tag.freezed.dart';
+part 'post_tag.g.dart';
+
+@freezed
+sealed class PostTag with _$PostTag {
+  const factory PostTag({
+    required String id,
+    required String slug,
+    String? name,
+    @Default([]) List<SnPost> posts,
+  }) = _PostTag;
+
+  factory PostTag.fromJson(Map<String, dynamic> json) =>
+      _$PostTagFromJson(json);
+}

lib/models/post_tag.freezed.dart

@@ -0,0 +1,163 @@
+// dart format width=80
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'post_tag.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$PostTag {
+
+ String get id; String get slug; String? get name; List<SnPost> get posts;
+/// Create a copy of PostTag
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$PostTagCopyWith<PostTag> get copyWith => _$PostTagCopyWithImpl<PostTag>(this as PostTag, _$identity);
+
+  /// Serializes this PostTag to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is PostTag&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.name, name) || other.name == name)&&const DeepCollectionEquality().equals(other.posts, posts));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,slug,name,const DeepCollectionEquality().hash(posts));
+
+@override
+String toString() {
+  return 'PostTag(id: $id, slug: $slug, name: $name, posts: $posts)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $PostTagCopyWith<$Res>  {
+  factory $PostTagCopyWith(PostTag value, $Res Function(PostTag) _then) = _$PostTagCopyWithImpl;
+@useResult
+$Res call({
+ String id, String slug, String? name, List<SnPost> posts
+});
+
+
+
+
+}
+/// @nodoc
+class _$PostTagCopyWithImpl<$Res>
+    implements $PostTagCopyWith<$Res> {
+  _$PostTagCopyWithImpl(this._self, this._then);
+
+  final PostTag _self;
+  final $Res Function(PostTag) _then;
+
+/// Create a copy of PostTag
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? slug = null,Object? name = freezed,Object? posts = null,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,slug: null == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
+as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String?,posts: null == posts ? _self.posts : posts // ignore: cast_nullable_to_non_nullable
+as List<SnPost>,
+  ));
+}
+
+}
+
+
+/// @nodoc
+@JsonSerializable()
+
+class _PostTag implements PostTag {
+  const _PostTag({required this.id, required this.slug, this.name, final  List<SnPost> posts = const []}): _posts = posts;
+  factory _PostTag.fromJson(Map<String, dynamic> json) => _$PostTagFromJson(json);
+
+@override final  String id;
+@override final  String slug;
+@override final  String? name;
+ final  List<SnPost> _posts;
+@override@JsonKey() List<SnPost> get posts {
+  if (_posts is EqualUnmodifiableListView) return _posts;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableListView(_posts);
+}
+
+
+/// Create a copy of PostTag
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$PostTagCopyWith<_PostTag> get copyWith => __$PostTagCopyWithImpl<_PostTag>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$PostTagToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _PostTag&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.name, name) || other.name == name)&&const DeepCollectionEquality().equals(other._posts, _posts));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,slug,name,const DeepCollectionEquality().hash(_posts));
+
+@override
+String toString() {
+  return 'PostTag(id: $id, slug: $slug, name: $name, posts: $posts)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$PostTagCopyWith<$Res> implements $PostTagCopyWith<$Res> {
+  factory _$PostTagCopyWith(_PostTag value, $Res Function(_PostTag) _then) = __$PostTagCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String slug, String? name, List<SnPost> posts
+});
+
+
+
+
+}
+/// @nodoc
+class __$PostTagCopyWithImpl<$Res>
+    implements _$PostTagCopyWith<$Res> {
+  __$PostTagCopyWithImpl(this._self, this._then);
+
+  final _PostTag _self;
+  final $Res Function(_PostTag) _then;
+
+/// Create a copy of PostTag
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? slug = null,Object? name = freezed,Object? posts = null,}) {
+  return _then(_PostTag(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,slug: null == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
+as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String?,posts: null == posts ? _self._posts : posts // ignore: cast_nullable_to_non_nullable
+as List<SnPost>,
+  ));
+}
+
+
+}
+
+// dart format on

lib/models/post_tag.g.dart

@@ -0,0 +1,25 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'post_tag.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_PostTag _$PostTagFromJson(Map<String, dynamic> json) => _PostTag(
+  id: json['id'] as String,
+  slug: json['slug'] as String,
+  name: json['name'] as String?,
+  posts:
+      (json['posts'] as List<dynamic>?)
+          ?.map((e) => SnPost.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      const [],
+);
+
+Map<String, dynamic> _$PostTagToJson(_PostTag instance) => <String, dynamic>{
+  'id': instance.id,
+  'slug': instance.slug,
+  'name': instance.name,
+  'posts': instance.posts.map((e) => e.toJson()).toList(),
+};

lib/models/realm.dart

@@ -10,8 +10,8 @@ sealed class SnRealm with _$SnRealm {
   const factory SnRealm({
     required String id,
     required String slug,
-    required String name,
-    required String description,
+    @Default('') String name,
+    @Default('') String description,
     required String? verifiedAs,
     required DateTime? verifiedAt,
     required bool isCommunity,

lib/models/realm.freezed.dart

@@ -117,13 +117,13 @@ $SnCloudFileCopyWith<$Res>? get background {
 @JsonSerializable()
 
 class _SnRealm implements SnRealm {
-  const _SnRealm({required this.id, required this.slug, required this.name, required this.description, required this.verifiedAs, required this.verifiedAt, required this.isCommunity, required this.isPublic, required this.picture, required this.background, required this.accountId, required this.createdAt, required this.updatedAt, required this.deletedAt});
+  const _SnRealm({required this.id, required this.slug, this.name = '', this.description = '', required this.verifiedAs, required this.verifiedAt, required this.isCommunity, required this.isPublic, required this.picture, required this.background, required this.accountId, required this.createdAt, required this.updatedAt, required this.deletedAt});
   factory _SnRealm.fromJson(Map<String, dynamic> json) => _$SnRealmFromJson(json);
 
 @override final  String id;
 @override final  String slug;
-@override final  String name;
-@override final  String description;
+@override@JsonKey() final  String name;
+@override@JsonKey() final  String description;
 @override final  String? verifiedAs;
 @override final  DateTime? verifiedAt;
 @override final  bool isCommunity;

lib/models/realm.g.dart

@@ -9,8 +9,8 @@ part of 'realm.dart';
 _SnRealm _$SnRealmFromJson(Map<String, dynamic> json) => _SnRealm(
   id: json['id'] as String,
   slug: json['slug'] as String,
-  name: json['name'] as String,
-  description: json['description'] as String,
+  name: json['name'] as String? ?? '',
+  description: json['description'] as String? ?? '',
   verifiedAs: json['verified_as'] as String?,
   verifiedAt:
       json['verified_at'] == null

lib/models/user.dart

@@ -1,5 +1,6 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:island/models/file.dart';
+import 'package:island/models/wallet.dart';
 
 part 'user.freezed.dart';
 part 'user.g.dart';
@@ -44,6 +45,7 @@ sealed class SnAccountProfile with _$SnAccountProfile {
     required SnCloudFile? picture,
     required SnCloudFile? background,
     required SnVerificationMark? verification,
+    required SnWalletSubscriptionRef? stellarMembership,
     required DateTime createdAt,
     required DateTime updatedAt,
     required DateTime? deletedAt,

lib/models/user.freezed.dart

@@ -200,7 +200,7 @@ $SnAccountProfileCopyWith<$Res> get profile {
 /// @nodoc
 mixin _$SnAccountProfile {
 
- String get id; String get firstName; String get middleName; String get lastName; String get bio; String get gender; String get pronouns; String get location; String get timeZone; DateTime? get birthday; DateTime? get lastSeenAt; SnAccountBadge? get activeBadge; int get experience; int get level; double get levelingProgress; SnCloudFile? get picture; SnCloudFile? get background; SnVerificationMark? get verification; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ String get id; String get firstName; String get middleName; String get lastName; String get bio; String get gender; String get pronouns; String get location; String get timeZone; DateTime? get birthday; DateTime? get lastSeenAt; SnAccountBadge? get activeBadge; int get experience; int get level; double get levelingProgress; SnCloudFile? get picture; SnCloudFile? get background; SnVerificationMark? get verification; SnWalletSubscriptionRef? get stellarMembership; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
 /// Create a copy of SnAccountProfile
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -213,16 +213,16 @@ $SnAccountProfileCopyWith<SnAccountProfile> get copyWith => _$SnAccountProfileCo
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnAccountProfile&&(identical(other.id, id) || other.id == id)&&(identical(other.firstName, firstName) || other.firstName == firstName)&&(identical(other.middleName, middleName) || other.middleName == middleName)&&(identical(other.lastName, lastName) || other.lastName == lastName)&&(identical(other.bio, bio) || other.bio == bio)&&(identical(other.gender, gender) || other.gender == gender)&&(identical(other.pronouns, pronouns) || other.pronouns == pronouns)&&(identical(other.location, location) || other.location == location)&&(identical(other.timeZone, timeZone) || other.timeZone == timeZone)&&(identical(other.birthday, birthday) || other.birthday == birthday)&&(identical(other.lastSeenAt, lastSeenAt) || other.lastSeenAt == lastSeenAt)&&(identical(other.activeBadge, activeBadge) || other.activeBadge == activeBadge)&&(identical(other.experience, experience) || other.experience == experience)&&(identical(other.level, level) || other.level == level)&&(identical(other.levelingProgress, levelingProgress) || other.levelingProgress == levelingProgress)&&(identical(other.picture, picture) || other.picture == picture)&&(identical(other.background, background) || other.background == background)&&(identical(other.verification, verification) || other.verification == verification)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnAccountProfile&&(identical(other.id, id) || other.id == id)&&(identical(other.firstName, firstName) || other.firstName == firstName)&&(identical(other.middleName, middleName) || other.middleName == middleName)&&(identical(other.lastName, lastName) || other.lastName == lastName)&&(identical(other.bio, bio) || other.bio == bio)&&(identical(other.gender, gender) || other.gender == gender)&&(identical(other.pronouns, pronouns) || other.pronouns == pronouns)&&(identical(other.location, location) || other.location == location)&&(identical(other.timeZone, timeZone) || other.timeZone == timeZone)&&(identical(other.birthday, birthday) || other.birthday == birthday)&&(identical(other.lastSeenAt, lastSeenAt) || other.lastSeenAt == lastSeenAt)&&(identical(other.activeBadge, activeBadge) || other.activeBadge == activeBadge)&&(identical(other.experience, experience) || other.experience == experience)&&(identical(other.level, level) || other.level == level)&&(identical(other.levelingProgress, levelingProgress) || other.levelingProgress == levelingProgress)&&(identical(other.picture, picture) || other.picture == picture)&&(identical(other.background, background) || other.background == background)&&(identical(other.verification, verification) || other.verification == verification)&&(identical(other.stellarMembership, stellarMembership) || other.stellarMembership == stellarMembership)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hashAll([runtimeType,id,firstName,middleName,lastName,bio,gender,pronouns,location,timeZone,birthday,lastSeenAt,activeBadge,experience,level,levelingProgress,picture,background,verification,createdAt,updatedAt,deletedAt]);
+int get hashCode => Object.hashAll([runtimeType,id,firstName,middleName,lastName,bio,gender,pronouns,location,timeZone,birthday,lastSeenAt,activeBadge,experience,level,levelingProgress,picture,background,verification,stellarMembership,createdAt,updatedAt,deletedAt]);
 
 @override
 String toString() {
-  return 'SnAccountProfile(id: $id, firstName: $firstName, middleName: $middleName, lastName: $lastName, bio: $bio, gender: $gender, pronouns: $pronouns, location: $location, timeZone: $timeZone, birthday: $birthday, lastSeenAt: $lastSeenAt, activeBadge: $activeBadge, experience: $experience, level: $level, levelingProgress: $levelingProgress, picture: $picture, background: $background, verification: $verification, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnAccountProfile(id: $id, firstName: $firstName, middleName: $middleName, lastName: $lastName, bio: $bio, gender: $gender, pronouns: $pronouns, location: $location, timeZone: $timeZone, birthday: $birthday, lastSeenAt: $lastSeenAt, activeBadge: $activeBadge, experience: $experience, level: $level, levelingProgress: $levelingProgress, picture: $picture, background: $background, verification: $verification, stellarMembership: $stellarMembership, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }
 
 
@@ -233,11 +233,11 @@ abstract mixin class $SnAccountProfileCopyWith<$Res>  {
   factory $SnAccountProfileCopyWith(SnAccountProfile value, $Res Function(SnAccountProfile) _then) = _$SnAccountProfileCopyWithImpl;
 @useResult
 $Res call({
- String id, String firstName, String middleName, String lastName, String bio, String gender, String pronouns, String location, String timeZone, DateTime? birthday, DateTime? lastSeenAt, SnAccountBadge? activeBadge, int experience, int level, double levelingProgress, SnCloudFile? picture, SnCloudFile? background, SnVerificationMark? verification, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String firstName, String middleName, String lastName, String bio, String gender, String pronouns, String location, String timeZone, DateTime? birthday, DateTime? lastSeenAt, SnAccountBadge? activeBadge, int experience, int level, double levelingProgress, SnCloudFile? picture, SnCloudFile? background, SnVerificationMark? verification, SnWalletSubscriptionRef? stellarMembership, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
-$SnAccountBadgeCopyWith<$Res>? get activeBadge;$SnCloudFileCopyWith<$Res>? get picture;$SnCloudFileCopyWith<$Res>? get background;$SnVerificationMarkCopyWith<$Res>? get verification;
+$SnAccountBadgeCopyWith<$Res>? get activeBadge;$SnCloudFileCopyWith<$Res>? get picture;$SnCloudFileCopyWith<$Res>? get background;$SnVerificationMarkCopyWith<$Res>? get verification;$SnWalletSubscriptionRefCopyWith<$Res>? get stellarMembership;
 
 }
 /// @nodoc
@@ -250,7 +250,7 @@ class _$SnAccountProfileCopyWithImpl<$Res>
 
 /// Create a copy of SnAccountProfile
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? firstName = null,Object? middleName = null,Object? lastName = null,Object? bio = null,Object? gender = null,Object? pronouns = null,Object? location = null,Object? timeZone = null,Object? birthday = freezed,Object? lastSeenAt = freezed,Object? activeBadge = freezed,Object? experience = null,Object? level = null,Object? levelingProgress = null,Object? picture = freezed,Object? background = freezed,Object? verification = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? firstName = null,Object? middleName = null,Object? lastName = null,Object? bio = null,Object? gender = null,Object? pronouns = null,Object? location = null,Object? timeZone = null,Object? birthday = freezed,Object? lastSeenAt = freezed,Object? activeBadge = freezed,Object? experience = null,Object? level = null,Object? levelingProgress = null,Object? picture = freezed,Object? background = freezed,Object? verification = freezed,Object? stellarMembership = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
   return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,firstName: null == firstName ? _self.firstName : firstName // ignore: cast_nullable_to_non_nullable
@@ -270,7 +270,8 @@ as int,levelingProgress: null == levelingProgress ? _self.levelingProgress : lev
 as double,picture: freezed == picture ? _self.picture : picture // ignore: cast_nullable_to_non_nullable
 as SnCloudFile?,background: freezed == background ? _self.background : background // ignore: cast_nullable_to_non_nullable
 as SnCloudFile?,verification: freezed == verification ? _self.verification : verification // ignore: cast_nullable_to_non_nullable
-as SnVerificationMark?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as SnVerificationMark?,stellarMembership: freezed == stellarMembership ? _self.stellarMembership : stellarMembership // ignore: cast_nullable_to_non_nullable
+as SnWalletSubscriptionRef?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
 as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
 as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,
@@ -324,6 +325,18 @@ $SnVerificationMarkCopyWith<$Res>? get verification {
   return $SnVerificationMarkCopyWith<$Res>(_self.verification!, (value) {
     return _then(_self.copyWith(verification: value));
   });
+}/// Create a copy of SnAccountProfile
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnWalletSubscriptionRefCopyWith<$Res>? get stellarMembership {
+    if (_self.stellarMembership == null) {
+    return null;
+  }
+
+  return $SnWalletSubscriptionRefCopyWith<$Res>(_self.stellarMembership!, (value) {
+    return _then(_self.copyWith(stellarMembership: value));
+  });
 }
 }
 
@@ -332,7 +345,7 @@ $SnVerificationMarkCopyWith<$Res>? get verification {
 @JsonSerializable()
 
 class _SnAccountProfile implements SnAccountProfile {
-  const _SnAccountProfile({required this.id, this.firstName = '', this.middleName = '', this.lastName = '', this.bio = '', this.gender = '', this.pronouns = '', this.location = '', this.timeZone = '', this.birthday, this.lastSeenAt, this.activeBadge, required this.experience, required this.level, required this.levelingProgress, required this.picture, required this.background, required this.verification, required this.createdAt, required this.updatedAt, required this.deletedAt});
+  const _SnAccountProfile({required this.id, this.firstName = '', this.middleName = '', this.lastName = '', this.bio = '', this.gender = '', this.pronouns = '', this.location = '', this.timeZone = '', this.birthday, this.lastSeenAt, this.activeBadge, required this.experience, required this.level, required this.levelingProgress, required this.picture, required this.background, required this.verification, required this.stellarMembership, required this.createdAt, required this.updatedAt, required this.deletedAt});
   factory _SnAccountProfile.fromJson(Map<String, dynamic> json) => _$SnAccountProfileFromJson(json);
 
 @override final  String id;
@@ -353,6 +366,7 @@ class _SnAccountProfile implements SnAccountProfile {
 @override final  SnCloudFile? picture;
 @override final  SnCloudFile? background;
 @override final  SnVerificationMark? verification;
+@override final  SnWalletSubscriptionRef? stellarMembership;
 @override final  DateTime createdAt;
 @override final  DateTime updatedAt;
 @override final  DateTime? deletedAt;
@@ -370,16 +384,16 @@ Map<String, dynamic> toJson() {
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnAccountProfile&&(identical(other.id, id) || other.id == id)&&(identical(other.firstName, firstName) || other.firstName == firstName)&&(identical(other.middleName, middleName) || other.middleName == middleName)&&(identical(other.lastName, lastName) || other.lastName == lastName)&&(identical(other.bio, bio) || other.bio == bio)&&(identical(other.gender, gender) || other.gender == gender)&&(identical(other.pronouns, pronouns) || other.pronouns == pronouns)&&(identical(other.location, location) || other.location == location)&&(identical(other.timeZone, timeZone) || other.timeZone == timeZone)&&(identical(other.birthday, birthday) || other.birthday == birthday)&&(identical(other.lastSeenAt, lastSeenAt) || other.lastSeenAt == lastSeenAt)&&(identical(other.activeBadge, activeBadge) || other.activeBadge == activeBadge)&&(identical(other.experience, experience) || other.experience == experience)&&(identical(other.level, level) || other.level == level)&&(identical(other.levelingProgress, levelingProgress) || other.levelingProgress == levelingProgress)&&(identical(other.picture, picture) || other.picture == picture)&&(identical(other.background, background) || other.background == background)&&(identical(other.verification, verification) || other.verification == verification)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnAccountProfile&&(identical(other.id, id) || other.id == id)&&(identical(other.firstName, firstName) || other.firstName == firstName)&&(identical(other.middleName, middleName) || other.middleName == middleName)&&(identical(other.lastName, lastName) || other.lastName == lastName)&&(identical(other.bio, bio) || other.bio == bio)&&(identical(other.gender, gender) || other.gender == gender)&&(identical(other.pronouns, pronouns) || other.pronouns == pronouns)&&(identical(other.location, location) || other.location == location)&&(identical(other.timeZone, timeZone) || other.timeZone == timeZone)&&(identical(other.birthday, birthday) || other.birthday == birthday)&&(identical(other.lastSeenAt, lastSeenAt) || other.lastSeenAt == lastSeenAt)&&(identical(other.activeBadge, activeBadge) || other.activeBadge == activeBadge)&&(identical(other.experience, experience) || other.experience == experience)&&(identical(other.level, level) || other.level == level)&&(identical(other.levelingProgress, levelingProgress) || other.levelingProgress == levelingProgress)&&(identical(other.picture, picture) || other.picture == picture)&&(identical(other.background, background) || other.background == background)&&(identical(other.verification, verification) || other.verification == verification)&&(identical(other.stellarMembership, stellarMembership) || other.stellarMembership == stellarMembership)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hashAll([runtimeType,id,firstName,middleName,lastName,bio,gender,pronouns,location,timeZone,birthday,lastSeenAt,activeBadge,experience,level,levelingProgress,picture,background,verification,createdAt,updatedAt,deletedAt]);
+int get hashCode => Object.hashAll([runtimeType,id,firstName,middleName,lastName,bio,gender,pronouns,location,timeZone,birthday,lastSeenAt,activeBadge,experience,level,levelingProgress,picture,background,verification,stellarMembership,createdAt,updatedAt,deletedAt]);
 
 @override
 String toString() {
-  return 'SnAccountProfile(id: $id, firstName: $firstName, middleName: $middleName, lastName: $lastName, bio: $bio, gender: $gender, pronouns: $pronouns, location: $location, timeZone: $timeZone, birthday: $birthday, lastSeenAt: $lastSeenAt, activeBadge: $activeBadge, experience: $experience, level: $level, levelingProgress: $levelingProgress, picture: $picture, background: $background, verification: $verification, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnAccountProfile(id: $id, firstName: $firstName, middleName: $middleName, lastName: $lastName, bio: $bio, gender: $gender, pronouns: $pronouns, location: $location, timeZone: $timeZone, birthday: $birthday, lastSeenAt: $lastSeenAt, activeBadge: $activeBadge, experience: $experience, level: $level, levelingProgress: $levelingProgress, picture: $picture, background: $background, verification: $verification, stellarMembership: $stellarMembership, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }
 
 
@@ -390,11 +404,11 @@ abstract mixin class _$SnAccountProfileCopyWith<$Res> implements $SnAccountProfi
   factory _$SnAccountProfileCopyWith(_SnAccountProfile value, $Res Function(_SnAccountProfile) _then) = __$SnAccountProfileCopyWithImpl;
 @override @useResult
 $Res call({
- String id, String firstName, String middleName, String lastName, String bio, String gender, String pronouns, String location, String timeZone, DateTime? birthday, DateTime? lastSeenAt, SnAccountBadge? activeBadge, int experience, int level, double levelingProgress, SnCloudFile? picture, SnCloudFile? background, SnVerificationMark? verification, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String firstName, String middleName, String lastName, String bio, String gender, String pronouns, String location, String timeZone, DateTime? birthday, DateTime? lastSeenAt, SnAccountBadge? activeBadge, int experience, int level, double levelingProgress, SnCloudFile? picture, SnCloudFile? background, SnVerificationMark? verification, SnWalletSubscriptionRef? stellarMembership, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
-@override $SnAccountBadgeCopyWith<$Res>? get activeBadge;@override $SnCloudFileCopyWith<$Res>? get picture;@override $SnCloudFileCopyWith<$Res>? get background;@override $SnVerificationMarkCopyWith<$Res>? get verification;
+@override $SnAccountBadgeCopyWith<$Res>? get activeBadge;@override $SnCloudFileCopyWith<$Res>? get picture;@override $SnCloudFileCopyWith<$Res>? get background;@override $SnVerificationMarkCopyWith<$Res>? get verification;@override $SnWalletSubscriptionRefCopyWith<$Res>? get stellarMembership;
 
 }
 /// @nodoc
@@ -407,7 +421,7 @@ class __$SnAccountProfileCopyWithImpl<$Res>
 
 /// Create a copy of SnAccountProfile
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? firstName = null,Object? middleName = null,Object? lastName = null,Object? bio = null,Object? gender = null,Object? pronouns = null,Object? location = null,Object? timeZone = null,Object? birthday = freezed,Object? lastSeenAt = freezed,Object? activeBadge = freezed,Object? experience = null,Object? level = null,Object? levelingProgress = null,Object? picture = freezed,Object? background = freezed,Object? verification = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? firstName = null,Object? middleName = null,Object? lastName = null,Object? bio = null,Object? gender = null,Object? pronouns = null,Object? location = null,Object? timeZone = null,Object? birthday = freezed,Object? lastSeenAt = freezed,Object? activeBadge = freezed,Object? experience = null,Object? level = null,Object? levelingProgress = null,Object? picture = freezed,Object? background = freezed,Object? verification = freezed,Object? stellarMembership = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
   return _then(_SnAccountProfile(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,firstName: null == firstName ? _self.firstName : firstName // ignore: cast_nullable_to_non_nullable
@@ -427,7 +441,8 @@ as int,levelingProgress: null == levelingProgress ? _self.levelingProgress : lev
 as double,picture: freezed == picture ? _self.picture : picture // ignore: cast_nullable_to_non_nullable
 as SnCloudFile?,background: freezed == background ? _self.background : background // ignore: cast_nullable_to_non_nullable
 as SnCloudFile?,verification: freezed == verification ? _self.verification : verification // ignore: cast_nullable_to_non_nullable
-as SnVerificationMark?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as SnVerificationMark?,stellarMembership: freezed == stellarMembership ? _self.stellarMembership : stellarMembership // ignore: cast_nullable_to_non_nullable
+as SnWalletSubscriptionRef?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
 as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
 as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,
@@ -482,6 +497,18 @@ $SnVerificationMarkCopyWith<$Res>? get verification {
   return $SnVerificationMarkCopyWith<$Res>(_self.verification!, (value) {
     return _then(_self.copyWith(verification: value));
   });
+}/// Create a copy of SnAccountProfile
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnWalletSubscriptionRefCopyWith<$Res>? get stellarMembership {
+    if (_self.stellarMembership == null) {
+    return null;
+  }
+
+  return $SnWalletSubscriptionRefCopyWith<$Res>(_self.stellarMembership!, (value) {
+    return _then(_self.copyWith(stellarMembership: value));
+  });
 }
 }
 

lib/models/user.g.dart

@@ -84,6 +84,12 @@ _SnAccountProfile _$SnAccountProfileFromJson(Map<String, dynamic> json) =>
               : SnVerificationMark.fromJson(
                 json['verification'] as Map<String, dynamic>,
               ),
+      stellarMembership:
+          json['stellar_membership'] == null
+              ? null
+              : SnWalletSubscriptionRef.fromJson(
+                json['stellar_membership'] as Map<String, dynamic>,
+              ),
       createdAt: DateTime.parse(json['created_at'] as String),
       updatedAt: DateTime.parse(json['updated_at'] as String),
       deletedAt:
@@ -112,6 +118,7 @@ Map<String, dynamic> _$SnAccountProfileToJson(_SnAccountProfile instance) =>
       'picture': instance.picture?.toJson(),
       'background': instance.background?.toJson(),
       'verification': instance.verification?.toJson(),
+      'stellar_membership': instance.stellarMembership?.toJson(),
       'created_at': instance.createdAt.toIso8601String(),
       'updated_at': instance.updatedAt.toIso8601String(),
       'deleted_at': instance.deletedAt?.toIso8601String(),

lib/models/wallet.dart

@@ -56,3 +56,74 @@ sealed class SnTransaction with _$SnTransaction {
   factory SnTransaction.fromJson(Map<String, dynamic> json) =>
       _$SnTransactionFromJson(json);
 }
+
+@freezed
+sealed class SnWalletSubscription with _$SnWalletSubscription {
+  const factory SnWalletSubscription({
+    required String id,
+    required DateTime begunAt,
+    required DateTime? endedAt,
+    required String identifier,
+    @Default(true) bool isActive,
+    @Default(false) bool isFreeTrial,
+    @Default(1) int status,
+    required String? paymentMethod,
+    required Map<String, dynamic>? paymentDetails,
+    required double? basePrice,
+    required String? couponId,
+    required dynamic coupon,
+    required DateTime? renewalAt,
+    required String accountId,
+    required SnAccount? account,
+    @Default(true) bool isAvailable,
+    required double? finalPrice,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required DateTime? deletedAt,
+  }) = _SnWalletSubscription;
+
+  factory SnWalletSubscription.fromJson(Map<String, dynamic> json) =>
+      _$SnWalletSubscriptionFromJson(json);
+}
+
+@freezed
+sealed class SnWalletSubscriptionRef with _$SnWalletSubscriptionRef {
+  const factory SnWalletSubscriptionRef({
+    required String id,
+    required bool isActive,
+    required String accountId,
+    required DateTime createdAt,
+    required DateTime? deletedAt,
+    required DateTime updatedAt,
+    required String identifier,
+  }) = _SnWalletSubscriptionRef;
+
+  factory SnWalletSubscriptionRef.fromJson(Map<String, dynamic> json) =>
+      _$SnWalletSubscriptionRefFromJson(json);
+}
+
+@freezed
+sealed class SnWalletOrder with _$SnWalletOrder {
+  const factory SnWalletOrder({
+    required String id,
+    required int status,
+    required String currency,
+    required dynamic remarks,
+    required String appIdentifier,
+    @Default({}) Map<String, dynamic> meta,
+    required int amount,
+    required DateTime expiredAt,
+    required String? payeeWalletId,
+    required SnWallet? payeeWallet,
+    required String? transactionId,
+    required SnTransaction? transaction,
+    required String? issuerAppId,
+    required dynamic issuerApp,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required DateTime? deletedAt,
+  }) = _SnWalletOrder;
+
+  factory SnWalletOrder.fromJson(Map<String, dynamic> json) =>
+      _$SnWalletOrderFromJson(json);
+}

lib/models/wallet.freezed.dart

@@ -558,4 +558,612 @@ $SnWalletCopyWith<$Res>? get payeeWallet {
 }
 }
 
+
+/// @nodoc
+mixin _$SnWalletSubscription {
+
+ String get id; DateTime get begunAt; DateTime? get endedAt; String get identifier; bool get isActive; bool get isFreeTrial; int get status; String? get paymentMethod; Map<String, dynamic>? get paymentDetails; double? get basePrice; String? get couponId; dynamic get coupon; DateTime? get renewalAt; String get accountId; SnAccount? get account; bool get isAvailable; double? get finalPrice; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+/// Create a copy of SnWalletSubscription
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnWalletSubscriptionCopyWith<SnWalletSubscription> get copyWith => _$SnWalletSubscriptionCopyWithImpl<SnWalletSubscription>(this as SnWalletSubscription, _$identity);
+
+  /// Serializes this SnWalletSubscription to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnWalletSubscription&&(identical(other.id, id) || other.id == id)&&(identical(other.begunAt, begunAt) || other.begunAt == begunAt)&&(identical(other.endedAt, endedAt) || other.endedAt == endedAt)&&(identical(other.identifier, identifier) || other.identifier == identifier)&&(identical(other.isActive, isActive) || other.isActive == isActive)&&(identical(other.isFreeTrial, isFreeTrial) || other.isFreeTrial == isFreeTrial)&&(identical(other.status, status) || other.status == status)&&(identical(other.paymentMethod, paymentMethod) || other.paymentMethod == paymentMethod)&&const DeepCollectionEquality().equals(other.paymentDetails, paymentDetails)&&(identical(other.basePrice, basePrice) || other.basePrice == basePrice)&&(identical(other.couponId, couponId) || other.couponId == couponId)&&const DeepCollectionEquality().equals(other.coupon, coupon)&&(identical(other.renewalAt, renewalAt) || other.renewalAt == renewalAt)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.account, account) || other.account == account)&&(identical(other.isAvailable, isAvailable) || other.isAvailable == isAvailable)&&(identical(other.finalPrice, finalPrice) || other.finalPrice == finalPrice)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hashAll([runtimeType,id,begunAt,endedAt,identifier,isActive,isFreeTrial,status,paymentMethod,const DeepCollectionEquality().hash(paymentDetails),basePrice,couponId,const DeepCollectionEquality().hash(coupon),renewalAt,accountId,account,isAvailable,finalPrice,createdAt,updatedAt,deletedAt]);
+
+@override
+String toString() {
+  return 'SnWalletSubscription(id: $id, begunAt: $begunAt, endedAt: $endedAt, identifier: $identifier, isActive: $isActive, isFreeTrial: $isFreeTrial, status: $status, paymentMethod: $paymentMethod, paymentDetails: $paymentDetails, basePrice: $basePrice, couponId: $couponId, coupon: $coupon, renewalAt: $renewalAt, accountId: $accountId, account: $account, isAvailable: $isAvailable, finalPrice: $finalPrice, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnWalletSubscriptionCopyWith<$Res>  {
+  factory $SnWalletSubscriptionCopyWith(SnWalletSubscription value, $Res Function(SnWalletSubscription) _then) = _$SnWalletSubscriptionCopyWithImpl;
+@useResult
+$Res call({
+ String id, DateTime begunAt, DateTime? endedAt, String identifier, bool isActive, bool isFreeTrial, int status, String? paymentMethod, Map<String, dynamic>? paymentDetails, double? basePrice, String? couponId, dynamic coupon, DateTime? renewalAt, String accountId, SnAccount? account, bool isAvailable, double? finalPrice, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+});
+
+
+$SnAccountCopyWith<$Res>? get account;
+
+}
+/// @nodoc
+class _$SnWalletSubscriptionCopyWithImpl<$Res>
+    implements $SnWalletSubscriptionCopyWith<$Res> {
+  _$SnWalletSubscriptionCopyWithImpl(this._self, this._then);
+
+  final SnWalletSubscription _self;
+  final $Res Function(SnWalletSubscription) _then;
+
+/// Create a copy of SnWalletSubscription
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? begunAt = null,Object? endedAt = freezed,Object? identifier = null,Object? isActive = null,Object? isFreeTrial = null,Object? status = null,Object? paymentMethod = freezed,Object? paymentDetails = freezed,Object? basePrice = freezed,Object? couponId = freezed,Object? coupon = freezed,Object? renewalAt = freezed,Object? accountId = null,Object? account = freezed,Object? isAvailable = null,Object? finalPrice = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,begunAt: null == begunAt ? _self.begunAt : begunAt // ignore: cast_nullable_to_non_nullable
+as DateTime,endedAt: freezed == endedAt ? _self.endedAt : endedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,identifier: null == identifier ? _self.identifier : identifier // ignore: cast_nullable_to_non_nullable
+as String,isActive: null == isActive ? _self.isActive : isActive // ignore: cast_nullable_to_non_nullable
+as bool,isFreeTrial: null == isFreeTrial ? _self.isFreeTrial : isFreeTrial // ignore: cast_nullable_to_non_nullable
+as bool,status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
+as int,paymentMethod: freezed == paymentMethod ? _self.paymentMethod : paymentMethod // ignore: cast_nullable_to_non_nullable
+as String?,paymentDetails: freezed == paymentDetails ? _self.paymentDetails : paymentDetails // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,basePrice: freezed == basePrice ? _self.basePrice : basePrice // ignore: cast_nullable_to_non_nullable
+as double?,couponId: freezed == couponId ? _self.couponId : couponId // ignore: cast_nullable_to_non_nullable
+as String?,coupon: freezed == coupon ? _self.coupon : coupon // ignore: cast_nullable_to_non_nullable
+as dynamic,renewalAt: freezed == renewalAt ? _self.renewalAt : renewalAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,account: freezed == account ? _self.account : account // ignore: cast_nullable_to_non_nullable
+as SnAccount?,isAvailable: null == isAvailable ? _self.isAvailable : isAvailable // ignore: cast_nullable_to_non_nullable
+as bool,finalPrice: freezed == finalPrice ? _self.finalPrice : finalPrice // ignore: cast_nullable_to_non_nullable
+as double?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+/// Create a copy of SnWalletSubscription
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnAccountCopyWith<$Res>? get account {
+    if (_self.account == null) {
+    return null;
+  }
+
+  return $SnAccountCopyWith<$Res>(_self.account!, (value) {
+    return _then(_self.copyWith(account: value));
+  });
+}
+}
+
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnWalletSubscription implements SnWalletSubscription {
+  const _SnWalletSubscription({required this.id, required this.begunAt, required this.endedAt, required this.identifier, this.isActive = true, this.isFreeTrial = false, this.status = 1, required this.paymentMethod, required final  Map<String, dynamic>? paymentDetails, required this.basePrice, required this.couponId, required this.coupon, required this.renewalAt, required this.accountId, required this.account, this.isAvailable = true, required this.finalPrice, required this.createdAt, required this.updatedAt, required this.deletedAt}): _paymentDetails = paymentDetails;
+  factory _SnWalletSubscription.fromJson(Map<String, dynamic> json) => _$SnWalletSubscriptionFromJson(json);
+
+@override final  String id;
+@override final  DateTime begunAt;
+@override final  DateTime? endedAt;
+@override final  String identifier;
+@override@JsonKey() final  bool isActive;
+@override@JsonKey() final  bool isFreeTrial;
+@override@JsonKey() final  int status;
+@override final  String? paymentMethod;
+ final  Map<String, dynamic>? _paymentDetails;
+@override Map<String, dynamic>? get paymentDetails {
+  final value = _paymentDetails;
+  if (value == null) return null;
+  if (_paymentDetails is EqualUnmodifiableMapView) return _paymentDetails;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(value);
+}
+
+@override final  double? basePrice;
+@override final  String? couponId;
+@override final  dynamic coupon;
+@override final  DateTime? renewalAt;
+@override final  String accountId;
+@override final  SnAccount? account;
+@override@JsonKey() final  bool isAvailable;
+@override final  double? finalPrice;
+@override final  DateTime createdAt;
+@override final  DateTime updatedAt;
+@override final  DateTime? deletedAt;
+
+/// Create a copy of SnWalletSubscription
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnWalletSubscriptionCopyWith<_SnWalletSubscription> get copyWith => __$SnWalletSubscriptionCopyWithImpl<_SnWalletSubscription>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnWalletSubscriptionToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnWalletSubscription&&(identical(other.id, id) || other.id == id)&&(identical(other.begunAt, begunAt) || other.begunAt == begunAt)&&(identical(other.endedAt, endedAt) || other.endedAt == endedAt)&&(identical(other.identifier, identifier) || other.identifier == identifier)&&(identical(other.isActive, isActive) || other.isActive == isActive)&&(identical(other.isFreeTrial, isFreeTrial) || other.isFreeTrial == isFreeTrial)&&(identical(other.status, status) || other.status == status)&&(identical(other.paymentMethod, paymentMethod) || other.paymentMethod == paymentMethod)&&const DeepCollectionEquality().equals(other._paymentDetails, _paymentDetails)&&(identical(other.basePrice, basePrice) || other.basePrice == basePrice)&&(identical(other.couponId, couponId) || other.couponId == couponId)&&const DeepCollectionEquality().equals(other.coupon, coupon)&&(identical(other.renewalAt, renewalAt) || other.renewalAt == renewalAt)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.account, account) || other.account == account)&&(identical(other.isAvailable, isAvailable) || other.isAvailable == isAvailable)&&(identical(other.finalPrice, finalPrice) || other.finalPrice == finalPrice)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hashAll([runtimeType,id,begunAt,endedAt,identifier,isActive,isFreeTrial,status,paymentMethod,const DeepCollectionEquality().hash(_paymentDetails),basePrice,couponId,const DeepCollectionEquality().hash(coupon),renewalAt,accountId,account,isAvailable,finalPrice,createdAt,updatedAt,deletedAt]);
+
+@override
+String toString() {
+  return 'SnWalletSubscription(id: $id, begunAt: $begunAt, endedAt: $endedAt, identifier: $identifier, isActive: $isActive, isFreeTrial: $isFreeTrial, status: $status, paymentMethod: $paymentMethod, paymentDetails: $paymentDetails, basePrice: $basePrice, couponId: $couponId, coupon: $coupon, renewalAt: $renewalAt, accountId: $accountId, account: $account, isAvailable: $isAvailable, finalPrice: $finalPrice, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnWalletSubscriptionCopyWith<$Res> implements $SnWalletSubscriptionCopyWith<$Res> {
+  factory _$SnWalletSubscriptionCopyWith(_SnWalletSubscription value, $Res Function(_SnWalletSubscription) _then) = __$SnWalletSubscriptionCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, DateTime begunAt, DateTime? endedAt, String identifier, bool isActive, bool isFreeTrial, int status, String? paymentMethod, Map<String, dynamic>? paymentDetails, double? basePrice, String? couponId, dynamic coupon, DateTime? renewalAt, String accountId, SnAccount? account, bool isAvailable, double? finalPrice, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+});
+
+
+@override $SnAccountCopyWith<$Res>? get account;
+
+}
+/// @nodoc
+class __$SnWalletSubscriptionCopyWithImpl<$Res>
+    implements _$SnWalletSubscriptionCopyWith<$Res> {
+  __$SnWalletSubscriptionCopyWithImpl(this._self, this._then);
+
+  final _SnWalletSubscription _self;
+  final $Res Function(_SnWalletSubscription) _then;
+
+/// Create a copy of SnWalletSubscription
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? begunAt = null,Object? endedAt = freezed,Object? identifier = null,Object? isActive = null,Object? isFreeTrial = null,Object? status = null,Object? paymentMethod = freezed,Object? paymentDetails = freezed,Object? basePrice = freezed,Object? couponId = freezed,Object? coupon = freezed,Object? renewalAt = freezed,Object? accountId = null,Object? account = freezed,Object? isAvailable = null,Object? finalPrice = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+  return _then(_SnWalletSubscription(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,begunAt: null == begunAt ? _self.begunAt : begunAt // ignore: cast_nullable_to_non_nullable
+as DateTime,endedAt: freezed == endedAt ? _self.endedAt : endedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,identifier: null == identifier ? _self.identifier : identifier // ignore: cast_nullable_to_non_nullable
+as String,isActive: null == isActive ? _self.isActive : isActive // ignore: cast_nullable_to_non_nullable
+as bool,isFreeTrial: null == isFreeTrial ? _self.isFreeTrial : isFreeTrial // ignore: cast_nullable_to_non_nullable
+as bool,status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
+as int,paymentMethod: freezed == paymentMethod ? _self.paymentMethod : paymentMethod // ignore: cast_nullable_to_non_nullable
+as String?,paymentDetails: freezed == paymentDetails ? _self._paymentDetails : paymentDetails // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,basePrice: freezed == basePrice ? _self.basePrice : basePrice // ignore: cast_nullable_to_non_nullable
+as double?,couponId: freezed == couponId ? _self.couponId : couponId // ignore: cast_nullable_to_non_nullable
+as String?,coupon: freezed == coupon ? _self.coupon : coupon // ignore: cast_nullable_to_non_nullable
+as dynamic,renewalAt: freezed == renewalAt ? _self.renewalAt : renewalAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,account: freezed == account ? _self.account : account // ignore: cast_nullable_to_non_nullable
+as SnAccount?,isAvailable: null == isAvailable ? _self.isAvailable : isAvailable // ignore: cast_nullable_to_non_nullable
+as bool,finalPrice: freezed == finalPrice ? _self.finalPrice : finalPrice // ignore: cast_nullable_to_non_nullable
+as double?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+/// Create a copy of SnWalletSubscription
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnAccountCopyWith<$Res>? get account {
+    if (_self.account == null) {
+    return null;
+  }
+
+  return $SnAccountCopyWith<$Res>(_self.account!, (value) {
+    return _then(_self.copyWith(account: value));
+  });
+}
+}
+
+
+/// @nodoc
+mixin _$SnWalletSubscriptionRef {
+
+ String get id; bool get isActive; String get accountId; DateTime get createdAt; DateTime? get deletedAt; DateTime get updatedAt; String get identifier;
+/// Create a copy of SnWalletSubscriptionRef
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnWalletSubscriptionRefCopyWith<SnWalletSubscriptionRef> get copyWith => _$SnWalletSubscriptionRefCopyWithImpl<SnWalletSubscriptionRef>(this as SnWalletSubscriptionRef, _$identity);
+
+  /// Serializes this SnWalletSubscriptionRef to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnWalletSubscriptionRef&&(identical(other.id, id) || other.id == id)&&(identical(other.isActive, isActive) || other.isActive == isActive)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.identifier, identifier) || other.identifier == identifier));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,isActive,accountId,createdAt,deletedAt,updatedAt,identifier);
+
+@override
+String toString() {
+  return 'SnWalletSubscriptionRef(id: $id, isActive: $isActive, accountId: $accountId, createdAt: $createdAt, deletedAt: $deletedAt, updatedAt: $updatedAt, identifier: $identifier)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnWalletSubscriptionRefCopyWith<$Res>  {
+  factory $SnWalletSubscriptionRefCopyWith(SnWalletSubscriptionRef value, $Res Function(SnWalletSubscriptionRef) _then) = _$SnWalletSubscriptionRefCopyWithImpl;
+@useResult
+$Res call({
+ String id, bool isActive, String accountId, DateTime createdAt, DateTime? deletedAt, DateTime updatedAt, String identifier
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnWalletSubscriptionRefCopyWithImpl<$Res>
+    implements $SnWalletSubscriptionRefCopyWith<$Res> {
+  _$SnWalletSubscriptionRefCopyWithImpl(this._self, this._then);
+
+  final SnWalletSubscriptionRef _self;
+  final $Res Function(SnWalletSubscriptionRef) _then;
+
+/// Create a copy of SnWalletSubscriptionRef
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? isActive = null,Object? accountId = null,Object? createdAt = null,Object? deletedAt = freezed,Object? updatedAt = null,Object? identifier = null,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,isActive: null == isActive ? _self.isActive : isActive // ignore: cast_nullable_to_non_nullable
+as bool,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,identifier: null == identifier ? _self.identifier : identifier // ignore: cast_nullable_to_non_nullable
+as String,
+  ));
+}
+
+}
+
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnWalletSubscriptionRef implements SnWalletSubscriptionRef {
+  const _SnWalletSubscriptionRef({required this.id, required this.isActive, required this.accountId, required this.createdAt, required this.deletedAt, required this.updatedAt, required this.identifier});
+  factory _SnWalletSubscriptionRef.fromJson(Map<String, dynamic> json) => _$SnWalletSubscriptionRefFromJson(json);
+
+@override final  String id;
+@override final  bool isActive;
+@override final  String accountId;
+@override final  DateTime createdAt;
+@override final  DateTime? deletedAt;
+@override final  DateTime updatedAt;
+@override final  String identifier;
+
+/// Create a copy of SnWalletSubscriptionRef
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnWalletSubscriptionRefCopyWith<_SnWalletSubscriptionRef> get copyWith => __$SnWalletSubscriptionRefCopyWithImpl<_SnWalletSubscriptionRef>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnWalletSubscriptionRefToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnWalletSubscriptionRef&&(identical(other.id, id) || other.id == id)&&(identical(other.isActive, isActive) || other.isActive == isActive)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.identifier, identifier) || other.identifier == identifier));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,isActive,accountId,createdAt,deletedAt,updatedAt,identifier);
+
+@override
+String toString() {
+  return 'SnWalletSubscriptionRef(id: $id, isActive: $isActive, accountId: $accountId, createdAt: $createdAt, deletedAt: $deletedAt, updatedAt: $updatedAt, identifier: $identifier)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnWalletSubscriptionRefCopyWith<$Res> implements $SnWalletSubscriptionRefCopyWith<$Res> {
+  factory _$SnWalletSubscriptionRefCopyWith(_SnWalletSubscriptionRef value, $Res Function(_SnWalletSubscriptionRef) _then) = __$SnWalletSubscriptionRefCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, bool isActive, String accountId, DateTime createdAt, DateTime? deletedAt, DateTime updatedAt, String identifier
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnWalletSubscriptionRefCopyWithImpl<$Res>
+    implements _$SnWalletSubscriptionRefCopyWith<$Res> {
+  __$SnWalletSubscriptionRefCopyWithImpl(this._self, this._then);
+
+  final _SnWalletSubscriptionRef _self;
+  final $Res Function(_SnWalletSubscriptionRef) _then;
+
+/// Create a copy of SnWalletSubscriptionRef
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? isActive = null,Object? accountId = null,Object? createdAt = null,Object? deletedAt = freezed,Object? updatedAt = null,Object? identifier = null,}) {
+  return _then(_SnWalletSubscriptionRef(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,isActive: null == isActive ? _self.isActive : isActive // ignore: cast_nullable_to_non_nullable
+as bool,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,identifier: null == identifier ? _self.identifier : identifier // ignore: cast_nullable_to_non_nullable
+as String,
+  ));
+}
+
+
+}
+
+
+/// @nodoc
+mixin _$SnWalletOrder {
+
+ String get id; int get status; String get currency; dynamic get remarks; String get appIdentifier; Map<String, dynamic> get meta; int get amount; DateTime get expiredAt; String? get payeeWalletId; SnWallet? get payeeWallet; String? get transactionId; SnTransaction? get transaction; String? get issuerAppId; dynamic get issuerApp; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+/// Create a copy of SnWalletOrder
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnWalletOrderCopyWith<SnWalletOrder> get copyWith => _$SnWalletOrderCopyWithImpl<SnWalletOrder>(this as SnWalletOrder, _$identity);
+
+  /// Serializes this SnWalletOrder to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnWalletOrder&&(identical(other.id, id) || other.id == id)&&(identical(other.status, status) || other.status == status)&&(identical(other.currency, currency) || other.currency == currency)&&const DeepCollectionEquality().equals(other.remarks, remarks)&&(identical(other.appIdentifier, appIdentifier) || other.appIdentifier == appIdentifier)&&const DeepCollectionEquality().equals(other.meta, meta)&&(identical(other.amount, amount) || other.amount == amount)&&(identical(other.expiredAt, expiredAt) || other.expiredAt == expiredAt)&&(identical(other.payeeWalletId, payeeWalletId) || other.payeeWalletId == payeeWalletId)&&(identical(other.payeeWallet, payeeWallet) || other.payeeWallet == payeeWallet)&&(identical(other.transactionId, transactionId) || other.transactionId == transactionId)&&(identical(other.transaction, transaction) || other.transaction == transaction)&&(identical(other.issuerAppId, issuerAppId) || other.issuerAppId == issuerAppId)&&const DeepCollectionEquality().equals(other.issuerApp, issuerApp)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,status,currency,const DeepCollectionEquality().hash(remarks),appIdentifier,const DeepCollectionEquality().hash(meta),amount,expiredAt,payeeWalletId,payeeWallet,transactionId,transaction,issuerAppId,const DeepCollectionEquality().hash(issuerApp),createdAt,updatedAt,deletedAt);
+
+@override
+String toString() {
+  return 'SnWalletOrder(id: $id, status: $status, currency: $currency, remarks: $remarks, appIdentifier: $appIdentifier, meta: $meta, amount: $amount, expiredAt: $expiredAt, payeeWalletId: $payeeWalletId, payeeWallet: $payeeWallet, transactionId: $transactionId, transaction: $transaction, issuerAppId: $issuerAppId, issuerApp: $issuerApp, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnWalletOrderCopyWith<$Res>  {
+  factory $SnWalletOrderCopyWith(SnWalletOrder value, $Res Function(SnWalletOrder) _then) = _$SnWalletOrderCopyWithImpl;
+@useResult
+$Res call({
+ String id, int status, String currency, dynamic remarks, String appIdentifier, Map<String, dynamic> meta, int amount, DateTime expiredAt, String? payeeWalletId, SnWallet? payeeWallet, String? transactionId, SnTransaction? transaction, String? issuerAppId, dynamic issuerApp, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+});
+
+
+$SnWalletCopyWith<$Res>? get payeeWallet;$SnTransactionCopyWith<$Res>? get transaction;
+
+}
+/// @nodoc
+class _$SnWalletOrderCopyWithImpl<$Res>
+    implements $SnWalletOrderCopyWith<$Res> {
+  _$SnWalletOrderCopyWithImpl(this._self, this._then);
+
+  final SnWalletOrder _self;
+  final $Res Function(SnWalletOrder) _then;
+
+/// Create a copy of SnWalletOrder
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? status = null,Object? currency = null,Object? remarks = freezed,Object? appIdentifier = null,Object? meta = null,Object? amount = null,Object? expiredAt = null,Object? payeeWalletId = freezed,Object? payeeWallet = freezed,Object? transactionId = freezed,Object? transaction = freezed,Object? issuerAppId = freezed,Object? issuerApp = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
+as int,currency: null == currency ? _self.currency : currency // ignore: cast_nullable_to_non_nullable
+as String,remarks: freezed == remarks ? _self.remarks : remarks // ignore: cast_nullable_to_non_nullable
+as dynamic,appIdentifier: null == appIdentifier ? _self.appIdentifier : appIdentifier // ignore: cast_nullable_to_non_nullable
+as String,meta: null == meta ? _self.meta : meta // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>,amount: null == amount ? _self.amount : amount // ignore: cast_nullable_to_non_nullable
+as int,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
+as DateTime,payeeWalletId: freezed == payeeWalletId ? _self.payeeWalletId : payeeWalletId // ignore: cast_nullable_to_non_nullable
+as String?,payeeWallet: freezed == payeeWallet ? _self.payeeWallet : payeeWallet // ignore: cast_nullable_to_non_nullable
+as SnWallet?,transactionId: freezed == transactionId ? _self.transactionId : transactionId // ignore: cast_nullable_to_non_nullable
+as String?,transaction: freezed == transaction ? _self.transaction : transaction // ignore: cast_nullable_to_non_nullable
+as SnTransaction?,issuerAppId: freezed == issuerAppId ? _self.issuerAppId : issuerAppId // ignore: cast_nullable_to_non_nullable
+as String?,issuerApp: freezed == issuerApp ? _self.issuerApp : issuerApp // ignore: cast_nullable_to_non_nullable
+as dynamic,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+/// Create a copy of SnWalletOrder
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnWalletCopyWith<$Res>? get payeeWallet {
+    if (_self.payeeWallet == null) {
+    return null;
+  }
+
+  return $SnWalletCopyWith<$Res>(_self.payeeWallet!, (value) {
+    return _then(_self.copyWith(payeeWallet: value));
+  });
+}/// Create a copy of SnWalletOrder
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnTransactionCopyWith<$Res>? get transaction {
+    if (_self.transaction == null) {
+    return null;
+  }
+
+  return $SnTransactionCopyWith<$Res>(_self.transaction!, (value) {
+    return _then(_self.copyWith(transaction: value));
+  });
+}
+}
+
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnWalletOrder implements SnWalletOrder {
+  const _SnWalletOrder({required this.id, required this.status, required this.currency, required this.remarks, required this.appIdentifier, final  Map<String, dynamic> meta = const {}, required this.amount, required this.expiredAt, required this.payeeWalletId, required this.payeeWallet, required this.transactionId, required this.transaction, required this.issuerAppId, required this.issuerApp, required this.createdAt, required this.updatedAt, required this.deletedAt}): _meta = meta;
+  factory _SnWalletOrder.fromJson(Map<String, dynamic> json) => _$SnWalletOrderFromJson(json);
+
+@override final  String id;
+@override final  int status;
+@override final  String currency;
+@override final  dynamic remarks;
+@override final  String appIdentifier;
+ final  Map<String, dynamic> _meta;
+@override@JsonKey() Map<String, dynamic> get meta {
+  if (_meta is EqualUnmodifiableMapView) return _meta;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(_meta);
+}
+
+@override final  int amount;
+@override final  DateTime expiredAt;
+@override final  String? payeeWalletId;
+@override final  SnWallet? payeeWallet;
+@override final  String? transactionId;
+@override final  SnTransaction? transaction;
+@override final  String? issuerAppId;
+@override final  dynamic issuerApp;
+@override final  DateTime createdAt;
+@override final  DateTime updatedAt;
+@override final  DateTime? deletedAt;
+
+/// Create a copy of SnWalletOrder
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnWalletOrderCopyWith<_SnWalletOrder> get copyWith => __$SnWalletOrderCopyWithImpl<_SnWalletOrder>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnWalletOrderToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnWalletOrder&&(identical(other.id, id) || other.id == id)&&(identical(other.status, status) || other.status == status)&&(identical(other.currency, currency) || other.currency == currency)&&const DeepCollectionEquality().equals(other.remarks, remarks)&&(identical(other.appIdentifier, appIdentifier) || other.appIdentifier == appIdentifier)&&const DeepCollectionEquality().equals(other._meta, _meta)&&(identical(other.amount, amount) || other.amount == amount)&&(identical(other.expiredAt, expiredAt) || other.expiredAt == expiredAt)&&(identical(other.payeeWalletId, payeeWalletId) || other.payeeWalletId == payeeWalletId)&&(identical(other.payeeWallet, payeeWallet) || other.payeeWallet == payeeWallet)&&(identical(other.transactionId, transactionId) || other.transactionId == transactionId)&&(identical(other.transaction, transaction) || other.transaction == transaction)&&(identical(other.issuerAppId, issuerAppId) || other.issuerAppId == issuerAppId)&&const DeepCollectionEquality().equals(other.issuerApp, issuerApp)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,status,currency,const DeepCollectionEquality().hash(remarks),appIdentifier,const DeepCollectionEquality().hash(_meta),amount,expiredAt,payeeWalletId,payeeWallet,transactionId,transaction,issuerAppId,const DeepCollectionEquality().hash(issuerApp),createdAt,updatedAt,deletedAt);
+
+@override
+String toString() {
+  return 'SnWalletOrder(id: $id, status: $status, currency: $currency, remarks: $remarks, appIdentifier: $appIdentifier, meta: $meta, amount: $amount, expiredAt: $expiredAt, payeeWalletId: $payeeWalletId, payeeWallet: $payeeWallet, transactionId: $transactionId, transaction: $transaction, issuerAppId: $issuerAppId, issuerApp: $issuerApp, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnWalletOrderCopyWith<$Res> implements $SnWalletOrderCopyWith<$Res> {
+  factory _$SnWalletOrderCopyWith(_SnWalletOrder value, $Res Function(_SnWalletOrder) _then) = __$SnWalletOrderCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, int status, String currency, dynamic remarks, String appIdentifier, Map<String, dynamic> meta, int amount, DateTime expiredAt, String? payeeWalletId, SnWallet? payeeWallet, String? transactionId, SnTransaction? transaction, String? issuerAppId, dynamic issuerApp, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+});
+
+
+@override $SnWalletCopyWith<$Res>? get payeeWallet;@override $SnTransactionCopyWith<$Res>? get transaction;
+
+}
+/// @nodoc
+class __$SnWalletOrderCopyWithImpl<$Res>
+    implements _$SnWalletOrderCopyWith<$Res> {
+  __$SnWalletOrderCopyWithImpl(this._self, this._then);
+
+  final _SnWalletOrder _self;
+  final $Res Function(_SnWalletOrder) _then;
+
+/// Create a copy of SnWalletOrder
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? status = null,Object? currency = null,Object? remarks = freezed,Object? appIdentifier = null,Object? meta = null,Object? amount = null,Object? expiredAt = null,Object? payeeWalletId = freezed,Object? payeeWallet = freezed,Object? transactionId = freezed,Object? transaction = freezed,Object? issuerAppId = freezed,Object? issuerApp = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+  return _then(_SnWalletOrder(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
+as int,currency: null == currency ? _self.currency : currency // ignore: cast_nullable_to_non_nullable
+as String,remarks: freezed == remarks ? _self.remarks : remarks // ignore: cast_nullable_to_non_nullable
+as dynamic,appIdentifier: null == appIdentifier ? _self.appIdentifier : appIdentifier // ignore: cast_nullable_to_non_nullable
+as String,meta: null == meta ? _self._meta : meta // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>,amount: null == amount ? _self.amount : amount // ignore: cast_nullable_to_non_nullable
+as int,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
+as DateTime,payeeWalletId: freezed == payeeWalletId ? _self.payeeWalletId : payeeWalletId // ignore: cast_nullable_to_non_nullable
+as String?,payeeWallet: freezed == payeeWallet ? _self.payeeWallet : payeeWallet // ignore: cast_nullable_to_non_nullable
+as SnWallet?,transactionId: freezed == transactionId ? _self.transactionId : transactionId // ignore: cast_nullable_to_non_nullable
+as String?,transaction: freezed == transaction ? _self.transaction : transaction // ignore: cast_nullable_to_non_nullable
+as SnTransaction?,issuerAppId: freezed == issuerAppId ? _self.issuerAppId : issuerAppId // ignore: cast_nullable_to_non_nullable
+as String?,issuerApp: freezed == issuerApp ? _self.issuerApp : issuerApp // ignore: cast_nullable_to_non_nullable
+as dynamic,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+/// Create a copy of SnWalletOrder
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnWalletCopyWith<$Res>? get payeeWallet {
+    if (_self.payeeWallet == null) {
+    return null;
+  }
+
+  return $SnWalletCopyWith<$Res>(_self.payeeWallet!, (value) {
+    return _then(_self.copyWith(payeeWallet: value));
+  });
+}/// Create a copy of SnWalletOrder
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnTransactionCopyWith<$Res>? get transaction {
+    if (_self.transaction == null) {
+    return null;
+  }
+
+  return $SnTransactionCopyWith<$Res>(_self.transaction!, (value) {
+    return _then(_self.copyWith(transaction: value));
+  });
+}
+}
+
 // dart format on

lib/models/wallet.g.dart

@@ -100,3 +100,145 @@ Map<String, dynamic> _$SnTransactionToJson(_SnTransaction instance) =>
       'updated_at': instance.updatedAt.toIso8601String(),
       'deleted_at': instance.deletedAt?.toIso8601String(),
     };
+
+_SnWalletSubscription _$SnWalletSubscriptionFromJson(
+  Map<String, dynamic> json,
+) => _SnWalletSubscription(
+  id: json['id'] as String,
+  begunAt: DateTime.parse(json['begun_at'] as String),
+  endedAt:
+      json['ended_at'] == null
+          ? null
+          : DateTime.parse(json['ended_at'] as String),
+  identifier: json['identifier'] as String,
+  isActive: json['is_active'] as bool? ?? true,
+  isFreeTrial: json['is_free_trial'] as bool? ?? false,
+  status: (json['status'] as num?)?.toInt() ?? 1,
+  paymentMethod: json['payment_method'] as String?,
+  paymentDetails: json['payment_details'] as Map<String, dynamic>?,
+  basePrice: (json['base_price'] as num?)?.toDouble(),
+  couponId: json['coupon_id'] as String?,
+  coupon: json['coupon'],
+  renewalAt:
+      json['renewal_at'] == null
+          ? null
+          : DateTime.parse(json['renewal_at'] as String),
+  accountId: json['account_id'] as String,
+  account:
+      json['account'] == null
+          ? null
+          : SnAccount.fromJson(json['account'] as Map<String, dynamic>),
+  isAvailable: json['is_available'] as bool? ?? true,
+  finalPrice: (json['final_price'] as num?)?.toDouble(),
+  createdAt: DateTime.parse(json['created_at'] as String),
+  updatedAt: DateTime.parse(json['updated_at'] as String),
+  deletedAt:
+      json['deleted_at'] == null
+          ? null
+          : DateTime.parse(json['deleted_at'] as String),
+);
+
+Map<String, dynamic> _$SnWalletSubscriptionToJson(
+  _SnWalletSubscription instance,
+) => <String, dynamic>{
+  'id': instance.id,
+  'begun_at': instance.begunAt.toIso8601String(),
+  'ended_at': instance.endedAt?.toIso8601String(),
+  'identifier': instance.identifier,
+  'is_active': instance.isActive,
+  'is_free_trial': instance.isFreeTrial,
+  'status': instance.status,
+  'payment_method': instance.paymentMethod,
+  'payment_details': instance.paymentDetails,
+  'base_price': instance.basePrice,
+  'coupon_id': instance.couponId,
+  'coupon': instance.coupon,
+  'renewal_at': instance.renewalAt?.toIso8601String(),
+  'account_id': instance.accountId,
+  'account': instance.account?.toJson(),
+  'is_available': instance.isAvailable,
+  'final_price': instance.finalPrice,
+  'created_at': instance.createdAt.toIso8601String(),
+  'updated_at': instance.updatedAt.toIso8601String(),
+  'deleted_at': instance.deletedAt?.toIso8601String(),
+};
+
+_SnWalletSubscriptionRef _$SnWalletSubscriptionRefFromJson(
+  Map<String, dynamic> json,
+) => _SnWalletSubscriptionRef(
+  id: json['id'] as String,
+  isActive: json['is_active'] as bool,
+  accountId: json['account_id'] as String,
+  createdAt: DateTime.parse(json['created_at'] as String),
+  deletedAt:
+      json['deleted_at'] == null
+          ? null
+          : DateTime.parse(json['deleted_at'] as String),
+  updatedAt: DateTime.parse(json['updated_at'] as String),
+  identifier: json['identifier'] as String,
+);
+
+Map<String, dynamic> _$SnWalletSubscriptionRefToJson(
+  _SnWalletSubscriptionRef instance,
+) => <String, dynamic>{
+  'id': instance.id,
+  'is_active': instance.isActive,
+  'account_id': instance.accountId,
+  'created_at': instance.createdAt.toIso8601String(),
+  'deleted_at': instance.deletedAt?.toIso8601String(),
+  'updated_at': instance.updatedAt.toIso8601String(),
+  'identifier': instance.identifier,
+};
+
+_SnWalletOrder _$SnWalletOrderFromJson(Map<String, dynamic> json) =>
+    _SnWalletOrder(
+      id: json['id'] as String,
+      status: (json['status'] as num).toInt(),
+      currency: json['currency'] as String,
+      remarks: json['remarks'],
+      appIdentifier: json['app_identifier'] as String,
+      meta: json['meta'] as Map<String, dynamic>? ?? const {},
+      amount: (json['amount'] as num).toInt(),
+      expiredAt: DateTime.parse(json['expired_at'] as String),
+      payeeWalletId: json['payee_wallet_id'] as String?,
+      payeeWallet:
+          json['payee_wallet'] == null
+              ? null
+              : SnWallet.fromJson(json['payee_wallet'] as Map<String, dynamic>),
+      transactionId: json['transaction_id'] as String?,
+      transaction:
+          json['transaction'] == null
+              ? null
+              : SnTransaction.fromJson(
+                json['transaction'] as Map<String, dynamic>,
+              ),
+      issuerAppId: json['issuer_app_id'] as String?,
+      issuerApp: json['issuer_app'],
+      createdAt: DateTime.parse(json['created_at'] as String),
+      updatedAt: DateTime.parse(json['updated_at'] as String),
+      deletedAt:
+          json['deleted_at'] == null
+              ? null
+              : DateTime.parse(json['deleted_at'] as String),
+    );
+
+Map<String, dynamic> _$SnWalletOrderToJson(_SnWalletOrder instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'status': instance.status,
+      'currency': instance.currency,
+      'remarks': instance.remarks,
+      'app_identifier': instance.appIdentifier,
+      'meta': instance.meta,
+      'amount': instance.amount,
+      'expired_at': instance.expiredAt.toIso8601String(),
+      'payee_wallet_id': instance.payeeWalletId,
+      'payee_wallet': instance.payeeWallet?.toJson(),
+      'transaction_id': instance.transactionId,
+      'transaction': instance.transaction?.toJson(),
+      'issuer_app_id': instance.issuerAppId,
+      'issuer_app': instance.issuerApp,
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'deleted_at': instance.deletedAt?.toIso8601String(),
+    };

lib/pods/call.dart

@@ -66,6 +66,8 @@ class CallNotifier extends _$CallNotifier {
 
   Timer? _durationTimer;
 
+  Room? get room => _room;
+
   @override
   CallState build() {
     // Subscribe to websocket updates

lib/pods/call.g.dart

@@ -6,7 +6,7 @@ part of 'call.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$callNotifierHash() => r'e04cea314c823e407d49fd616d90d77491232c12';
+String _$callNotifierHash() => r'47eaba43aa2af1a107725998f4a34af2c94fbc55';
 
 /// See also [CallNotifier].
 @ProviderFor(CallNotifier)

lib/pods/config.dart

@@ -58,6 +58,7 @@ sealed class AppSettings with _$AppSettings {
     required bool appBarTransparent,
     required String? customFonts,
     required int? appColorScheme, // The color stored via the int type
+    required Size? windowSize, // The window size for desktop platforms
   }) = _AppSettings;
 }
 
@@ -74,9 +75,27 @@ class AppSettingsNotifier extends _$AppSettingsNotifier {
       appBarTransparent: prefs.getBool(kAppbarTransparentStoreKey) ?? false,
       customFonts: prefs.getString(kAppCustomFonts),
       appColorScheme: prefs.getInt(kAppColorSchemeStoreKey),
+      windowSize: _getWindowSizeFromPrefs(prefs),
     );
   }
 
+  Size? _getWindowSizeFromPrefs(SharedPreferences prefs) {
+    final sizeString = prefs.getString(kAppWindowSize);
+    if (sizeString == null) return null;
+    
+    try {
+      final parts = sizeString.split(',');
+      if (parts.length == 2) {
+        final width = double.parse(parts[0]);
+        final height = double.parse(parts[1]);
+        return Size(width, height);
+      }
+    } catch (e) {
+      // Invalid format, return null
+    }
+    return null;
+  }
+
   void setAutoTranslate(bool value) {
     final prefs = ref.read(sharedPreferencesProvider);
     prefs.setBool(kAppAutoTranslate, value);
@@ -121,6 +140,20 @@ class AppSettingsNotifier extends _$AppSettingsNotifier {
     state = state.copyWith(appColorScheme: value);
     ref.read(themeProvider.notifier).reloadTheme();
   }
+
+  void setWindowSize(Size? size) {
+    final prefs = ref.read(sharedPreferencesProvider);
+    if (size != null) {
+      prefs.setString(kAppWindowSize, '${size.width},${size.height}');
+    } else {
+      prefs.remove(kAppWindowSize);
+    }
+    state = state.copyWith(windowSize: size);
+  }
+
+  Size? getWindowSize() {
+    return state.windowSize;
+  }
 }
 
 final updateInfoProvider =

lib/pods/config.freezed.dart

@@ -15,7 +15,8 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$AppSettings {
 
- bool get autoTranslate; bool get soundEffects; bool get aprilFoolFeatures; bool get enterToSend; bool get appBarTransparent; String? get customFonts; int? get appColorScheme;
+ bool get autoTranslate; bool get soundEffects; bool get aprilFoolFeatures; bool get enterToSend; bool get appBarTransparent; String? get customFonts; int? get appColorScheme;// The color stored via the int type
+ Size? get windowSize;
 /// Create a copy of AppSettings
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -26,16 +27,16 @@ $AppSettingsCopyWith<AppSettings> get copyWith => _$AppSettingsCopyWithImpl<AppS
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is AppSettings&&(identical(other.autoTranslate, autoTranslate) || other.autoTranslate == autoTranslate)&&(identical(other.soundEffects, soundEffects) || other.soundEffects == soundEffects)&&(identical(other.aprilFoolFeatures, aprilFoolFeatures) || other.aprilFoolFeatures == aprilFoolFeatures)&&(identical(other.enterToSend, enterToSend) || other.enterToSend == enterToSend)&&(identical(other.appBarTransparent, appBarTransparent) || other.appBarTransparent == appBarTransparent)&&(identical(other.customFonts, customFonts) || other.customFonts == customFonts)&&(identical(other.appColorScheme, appColorScheme) || other.appColorScheme == appColorScheme));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is AppSettings&&(identical(other.autoTranslate, autoTranslate) || other.autoTranslate == autoTranslate)&&(identical(other.soundEffects, soundEffects) || other.soundEffects == soundEffects)&&(identical(other.aprilFoolFeatures, aprilFoolFeatures) || other.aprilFoolFeatures == aprilFoolFeatures)&&(identical(other.enterToSend, enterToSend) || other.enterToSend == enterToSend)&&(identical(other.appBarTransparent, appBarTransparent) || other.appBarTransparent == appBarTransparent)&&(identical(other.customFonts, customFonts) || other.customFonts == customFonts)&&(identical(other.appColorScheme, appColorScheme) || other.appColorScheme == appColorScheme)&&(identical(other.windowSize, windowSize) || other.windowSize == windowSize));
 }
 
 
 @override
-int get hashCode => Object.hash(runtimeType,autoTranslate,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,customFonts,appColorScheme);
+int get hashCode => Object.hash(runtimeType,autoTranslate,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,customFonts,appColorScheme,windowSize);
 
 @override
 String toString() {
-  return 'AppSettings(autoTranslate: $autoTranslate, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, customFonts: $customFonts, appColorScheme: $appColorScheme)';
+  return 'AppSettings(autoTranslate: $autoTranslate, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, customFonts: $customFonts, appColorScheme: $appColorScheme, windowSize: $windowSize)';
 }
 
 
@@ -46,7 +47,7 @@ abstract mixin class $AppSettingsCopyWith<$Res>  {
   factory $AppSettingsCopyWith(AppSettings value, $Res Function(AppSettings) _then) = _$AppSettingsCopyWithImpl;
 @useResult
 $Res call({
- bool autoTranslate, bool soundEffects, bool aprilFoolFeatures, bool enterToSend, bool appBarTransparent, String? customFonts, int? appColorScheme
+ bool autoTranslate, bool soundEffects, bool aprilFoolFeatures, bool enterToSend, bool appBarTransparent, String? customFonts, int? appColorScheme, Size? windowSize
 });
 
 
@@ -63,7 +64,7 @@ class _$AppSettingsCopyWithImpl<$Res>
 
 /// Create a copy of AppSettings
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? autoTranslate = null,Object? soundEffects = null,Object? aprilFoolFeatures = null,Object? enterToSend = null,Object? appBarTransparent = null,Object? customFonts = freezed,Object? appColorScheme = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? autoTranslate = null,Object? soundEffects = null,Object? aprilFoolFeatures = null,Object? enterToSend = null,Object? appBarTransparent = null,Object? customFonts = freezed,Object? appColorScheme = freezed,Object? windowSize = freezed,}) {
   return _then(_self.copyWith(
 autoTranslate: null == autoTranslate ? _self.autoTranslate : autoTranslate // ignore: cast_nullable_to_non_nullable
 as bool,soundEffects: null == soundEffects ? _self.soundEffects : soundEffects // ignore: cast_nullable_to_non_nullable
@@ -72,7 +73,8 @@ as bool,enterToSend: null == enterToSend ? _self.enterToSend : enterToSend // ig
 as bool,appBarTransparent: null == appBarTransparent ? _self.appBarTransparent : appBarTransparent // ignore: cast_nullable_to_non_nullable
 as bool,customFonts: freezed == customFonts ? _self.customFonts : customFonts // ignore: cast_nullable_to_non_nullable
 as String?,appColorScheme: freezed == appColorScheme ? _self.appColorScheme : appColorScheme // ignore: cast_nullable_to_non_nullable
-as int?,
+as int?,windowSize: freezed == windowSize ? _self.windowSize : windowSize // ignore: cast_nullable_to_non_nullable
+as Size?,
   ));
 }
 
@@ -83,7 +85,7 @@ as int?,
 
 
 class _AppSettings implements AppSettings {
-  const _AppSettings({required this.autoTranslate, required this.soundEffects, required this.aprilFoolFeatures, required this.enterToSend, required this.appBarTransparent, required this.customFonts, required this.appColorScheme});
+  const _AppSettings({required this.autoTranslate, required this.soundEffects, required this.aprilFoolFeatures, required this.enterToSend, required this.appBarTransparent, required this.customFonts, required this.appColorScheme, required this.windowSize});
   
 
 @override final  bool autoTranslate;
@@ -93,6 +95,8 @@ class _AppSettings implements AppSettings {
 @override final  bool appBarTransparent;
 @override final  String? customFonts;
 @override final  int? appColorScheme;
+// The color stored via the int type
+@override final  Size? windowSize;
 
 /// Create a copy of AppSettings
 /// with the given fields replaced by the non-null parameter values.
@@ -104,16 +108,16 @@ _$AppSettingsCopyWith<_AppSettings> get copyWith => __$AppSettingsCopyWithImpl<_
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _AppSettings&&(identical(other.autoTranslate, autoTranslate) || other.autoTranslate == autoTranslate)&&(identical(other.soundEffects, soundEffects) || other.soundEffects == soundEffects)&&(identical(other.aprilFoolFeatures, aprilFoolFeatures) || other.aprilFoolFeatures == aprilFoolFeatures)&&(identical(other.enterToSend, enterToSend) || other.enterToSend == enterToSend)&&(identical(other.appBarTransparent, appBarTransparent) || other.appBarTransparent == appBarTransparent)&&(identical(other.customFonts, customFonts) || other.customFonts == customFonts)&&(identical(other.appColorScheme, appColorScheme) || other.appColorScheme == appColorScheme));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _AppSettings&&(identical(other.autoTranslate, autoTranslate) || other.autoTranslate == autoTranslate)&&(identical(other.soundEffects, soundEffects) || other.soundEffects == soundEffects)&&(identical(other.aprilFoolFeatures, aprilFoolFeatures) || other.aprilFoolFeatures == aprilFoolFeatures)&&(identical(other.enterToSend, enterToSend) || other.enterToSend == enterToSend)&&(identical(other.appBarTransparent, appBarTransparent) || other.appBarTransparent == appBarTransparent)&&(identical(other.customFonts, customFonts) || other.customFonts == customFonts)&&(identical(other.appColorScheme, appColorScheme) || other.appColorScheme == appColorScheme)&&(identical(other.windowSize, windowSize) || other.windowSize == windowSize));
 }
 
 
 @override
-int get hashCode => Object.hash(runtimeType,autoTranslate,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,customFonts,appColorScheme);
+int get hashCode => Object.hash(runtimeType,autoTranslate,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,customFonts,appColorScheme,windowSize);
 
 @override
 String toString() {
-  return 'AppSettings(autoTranslate: $autoTranslate, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, customFonts: $customFonts, appColorScheme: $appColorScheme)';
+  return 'AppSettings(autoTranslate: $autoTranslate, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, customFonts: $customFonts, appColorScheme: $appColorScheme, windowSize: $windowSize)';
 }
 
 
@@ -124,7 +128,7 @@ abstract mixin class _$AppSettingsCopyWith<$Res> implements $AppSettingsCopyWith
   factory _$AppSettingsCopyWith(_AppSettings value, $Res Function(_AppSettings) _then) = __$AppSettingsCopyWithImpl;
 @override @useResult
 $Res call({
- bool autoTranslate, bool soundEffects, bool aprilFoolFeatures, bool enterToSend, bool appBarTransparent, String? customFonts, int? appColorScheme
+ bool autoTranslate, bool soundEffects, bool aprilFoolFeatures, bool enterToSend, bool appBarTransparent, String? customFonts, int? appColorScheme, Size? windowSize
 });
 
 
@@ -141,7 +145,7 @@ class __$AppSettingsCopyWithImpl<$Res>
 
 /// Create a copy of AppSettings
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? autoTranslate = null,Object? soundEffects = null,Object? aprilFoolFeatures = null,Object? enterToSend = null,Object? appBarTransparent = null,Object? customFonts = freezed,Object? appColorScheme = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? autoTranslate = null,Object? soundEffects = null,Object? aprilFoolFeatures = null,Object? enterToSend = null,Object? appBarTransparent = null,Object? customFonts = freezed,Object? appColorScheme = freezed,Object? windowSize = freezed,}) {
   return _then(_AppSettings(
 autoTranslate: null == autoTranslate ? _self.autoTranslate : autoTranslate // ignore: cast_nullable_to_non_nullable
 as bool,soundEffects: null == soundEffects ? _self.soundEffects : soundEffects // ignore: cast_nullable_to_non_nullable
@@ -150,7 +154,8 @@ as bool,enterToSend: null == enterToSend ? _self.enterToSend : enterToSend // ig
 as bool,appBarTransparent: null == appBarTransparent ? _self.appBarTransparent : appBarTransparent // ignore: cast_nullable_to_non_nullable
 as bool,customFonts: freezed == customFonts ? _self.customFonts : customFonts // ignore: cast_nullable_to_non_nullable
 as String?,appColorScheme: freezed == appColorScheme ? _self.appColorScheme : appColorScheme // ignore: cast_nullable_to_non_nullable
-as int?,
+as int?,windowSize: freezed == windowSize ? _self.windowSize : windowSize // ignore: cast_nullable_to_non_nullable
+as Size?,
   ));
 }
 

lib/pods/config.g.dart

@@ -7,7 +7,7 @@ part of 'config.dart';
 // **************************************************************************
 
 String _$appSettingsNotifierHash() =>
-    r'4f727d448ee17a87b5698b8e36ef67521655406c';
+    r'c4f40a3bc4311c6360c2b5e44f8df5e5d7c1bd75';
 
 /// See also [AppSettingsNotifier].
 @ProviderFor(AppSettingsNotifier)

lib/pods/link_preview.dart

@@ -0,0 +1,28 @@
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:island/models/embed.dart';
+import 'package:island/pods/network.dart';
+
+part 'link_preview.g.dart';
+
+@riverpod
+class LinkPreview extends _$LinkPreview {
+  @override
+  Future<SnScrappedLink?> build(String url) async {
+    final client = ref.read(apiClientProvider);
+
+    try {
+      final response = await client.get(
+        '/scrap/link',
+        queryParameters: {'url': url},
+      );
+
+      if (response.statusCode == 200 && response.data != null) {
+        return SnScrappedLink.fromJson(response.data);
+      }
+      return null;
+    } catch (e) {
+      // Return null on error to show fallback UI
+      return null;
+    }
+  }
+}

lib/pods/link_preview.g.dart

@@ -0,0 +1,164 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'link_preview.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$linkPreviewHash() => r'5130593d3066155cb958d20714ee577df1f940d7';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$LinkPreview
+    extends BuildlessAutoDisposeAsyncNotifier<SnScrappedLink?> {
+  late final String url;
+
+  FutureOr<SnScrappedLink?> build(String url);
+}
+
+/// See also [LinkPreview].
+@ProviderFor(LinkPreview)
+const linkPreviewProvider = LinkPreviewFamily();
+
+/// See also [LinkPreview].
+class LinkPreviewFamily extends Family<AsyncValue<SnScrappedLink?>> {
+  /// See also [LinkPreview].
+  const LinkPreviewFamily();
+
+  /// See also [LinkPreview].
+  LinkPreviewProvider call(String url) {
+    return LinkPreviewProvider(url);
+  }
+
+  @override
+  LinkPreviewProvider getProviderOverride(
+    covariant LinkPreviewProvider provider,
+  ) {
+    return call(provider.url);
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'linkPreviewProvider';
+}
+
+/// See also [LinkPreview].
+class LinkPreviewProvider
+    extends AutoDisposeAsyncNotifierProviderImpl<LinkPreview, SnScrappedLink?> {
+  /// See also [LinkPreview].
+  LinkPreviewProvider(String url)
+    : this._internal(
+        () => LinkPreview()..url = url,
+        from: linkPreviewProvider,
+        name: r'linkPreviewProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$linkPreviewHash,
+        dependencies: LinkPreviewFamily._dependencies,
+        allTransitiveDependencies: LinkPreviewFamily._allTransitiveDependencies,
+        url: url,
+      );
+
+  LinkPreviewProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.url,
+  }) : super.internal();
+
+  final String url;
+
+  @override
+  FutureOr<SnScrappedLink?> runNotifierBuild(covariant LinkPreview notifier) {
+    return notifier.build(url);
+  }
+
+  @override
+  Override overrideWith(LinkPreview Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: LinkPreviewProvider._internal(
+        () => create()..url = url,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        url: url,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeAsyncNotifierProviderElement<LinkPreview, SnScrappedLink?>
+  createElement() {
+    return _LinkPreviewProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is LinkPreviewProvider && other.url == url;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, url.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin LinkPreviewRef on AutoDisposeAsyncNotifierProviderRef<SnScrappedLink?> {
+  /// The parameter `url` of this provider.
+  String get url;
+}
+
+class _LinkPreviewProviderElement
+    extends
+        AutoDisposeAsyncNotifierProviderElement<LinkPreview, SnScrappedLink?>
+    with LinkPreviewRef {
+  _LinkPreviewProviderElement(super.provider);
+
+  @override
+  String get url => (origin as LinkPreviewProvider).url;
+}
+
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/pods/theme.dart

@@ -102,6 +102,7 @@ Future<ThemeData> createAppTheme(
     ),
     snackBarTheme: SnackBarThemeData(
       behavior: useM3 ? SnackBarBehavior.floating : SnackBarBehavior.fixed,
+      width: 480,
     ),
     appBarTheme: AppBarTheme(
       centerTitle: true,

lib/pods/userinfo.dart

@@ -32,7 +32,6 @@ class UserInfoNotifier extends StateNotifier<AsyncValue<SnAccount?>> {
     state = const AsyncValue.data(null);
     final prefs = _ref.read(sharedPreferencesProvider);
     await prefs.remove(kTokenPairStoreKey);
-    _ref.invalidate(userInfoProvider);
     _ref.invalidate(tokenProvider);
   }
 }

lib/route.dart

@@ -1,81 +1,327 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:island/route.gr.dart';
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/widgets/app_wrapper.dart';
+import 'package:island/screens/tabs.dart';
 
-@AutoRouterConfig(replaceInRouteName: 'Screen|Page,Route')
-class AppRouter extends RootStackRouter {
-  @override
-  RouteType get defaultRouteType => RouteType.adaptive();
+import 'package:island/screens/explore.dart';
+import 'package:island/screens/account.dart';
+import 'package:island/screens/notification.dart';
+import 'package:island/screens/wallet.dart';
+import 'package:island/screens/account/relationship.dart';
+import 'package:island/screens/account/profile.dart';
+import 'package:island/screens/account/me/update.dart';
+import 'package:island/screens/account/leveling.dart';
+import 'package:island/screens/account/me/settings.dart';
+import 'package:island/screens/chat/chat.dart';
+import 'package:island/screens/chat/room.dart';
+import 'package:island/screens/chat/room_detail.dart';
+import 'package:island/screens/chat/call.dart';
+import 'package:island/screens/creators/hub.dart';
+import 'package:island/screens/creators/posts/list.dart';
+import 'package:island/screens/creators/stickers/stickers.dart';
+import 'package:island/screens/creators/stickers/pack_detail.dart';
+import 'package:island/screens/creators/publishers.dart';
+import 'package:island/screens/posts/compose.dart';
+import 'package:island/screens/posts/detail.dart';
+import 'package:island/screens/posts/pub_profile.dart';
+import 'package:island/screens/auth/login.dart';
+import 'package:island/screens/auth/create_account.dart';
+import 'package:island/screens/settings.dart';
+import 'package:island/screens/realm/realms.dart';
+import 'package:island/screens/realm/detail.dart';
+import 'package:island/screens/account/event_calendar.dart';
+import 'package:island/screens/discovery/realms.dart';
 
-  @override
-  List<AutoRoute> get routes => [
-    AutoRoute(page: PostComposeRoute.page, path: '/posts/compose'),
-    AutoRoute(page: PostEditRoute.page, path: '/posts/:id/edit'),
-    AutoRoute(
-      page: ExploreShellRoute.page,
-      path: '/',
-      children: [
-        AutoRoute(page: ExploreRoute.page, path: ''),
-        AutoRoute(page: PostDetailRoute.page, path: 'posts/:id'),
-        AutoRoute(page: PublisherProfileRoute.page, path: 'publishers/:name'),
-      ],
-    ),
-    AutoRoute(
-      page: AccountShellRoute.page,
-      path: '/account',
-      children: [
-        AutoRoute(page: AccountRoute.page, path: ''),
-        AutoRoute(page: NotificationRoute.page, path: 'notifications'),
-        AutoRoute(page: WalletRoute.page, path: 'wallet'),
-        AutoRoute(page: RelationshipRoute.page, path: 'relationships'),
-        AutoRoute(page: AccountProfileRoute.page, path: ':name'),
-        AutoRoute(page: UpdateProfileRoute.page, path: 'me/update'),
-        AutoRoute(page: AccountSettingsRoute.page, path: 'settings'),
-      ],
-    ),
-    AutoRoute(page: EventCalanderRoute.page, path: '/account/:name/calendar'),
-    AutoRoute(page: RealmListRoute.page, path: '/realms'),
-    AutoRoute(
-      page: ChatShellRoute.page,
-      path: '/chat',
-      children: [
-        AutoRoute(page: ChatListRoute.page, path: ''),
-        AutoRoute(page: ChatRoomRoute.page, path: ':id'),
-        AutoRoute(page: CallRoute.page, path: ':id/call'),
-        AutoRoute(page: NewChatRoute.page, path: 'new'),
-        AutoRoute(page: EditChatRoute.page, path: ':id/edit'),
-        AutoRoute(page: ChatDetailRoute.page, path: ':id/detail'),
-      ],
-    ),
-    AutoRoute(
-      page: CreatorHubShellRoute.page,
-      path: '/creators',
-      children: [
-        AutoRoute(page: CreatorHubRoute.page, path: ''),
-        AutoRoute(page: CreatorPostListRoute.page, path: ':name/posts'),
-        AutoRoute(page: StickersRoute.page, path: ':name/stickers'),
-        AutoRoute(page: NewStickerPacksRoute.page, path: ':name/stickers/new'),
-        AutoRoute(
-          page: EditStickerPacksRoute.page,
-          path: ':name/stickers/:packId/edit',
-        ),
-        AutoRoute(
-          page: StickerPackDetailRoute.page,
-          path: ':name/stickers/:packId',
-        ),
-        AutoRoute(page: NewStickersRoute.page, path: ':name/stickers/new'),
-        AutoRoute(
-          page: EditStickersRoute.page,
-          path: ':name/stickers/:id/edit',
-        ),
-        AutoRoute(page: NewPublisherRoute.page, path: 'new'),
-        AutoRoute(page: EditPublisherRoute.page, path: ':name/edit'),
-      ],
-    ),
-    AutoRoute(page: LoginRoute.page, path: '/auth/login'),
-    AutoRoute(page: CreateAccountRoute.page, path: '/auth/create-account'),
-    AutoRoute(page: SettingsRoute.page, path: '/settings'),
-    AutoRoute(page: NewRealmRoute.page, path: '/realms/new'),
-    AutoRoute(page: RealmDetailRoute.page, path: '/realms/:slug'),
-    AutoRoute(page: EditRealmRoute.page, path: '/realms/:slug/edit'),
-  ];
+// Shell route keys for nested navigation
+final rootNavigatorKey = GlobalKey<NavigatorState>();
+final _shellNavigatorKey = GlobalKey<NavigatorState>();
+final _tabsShellKey = GlobalKey<NavigatorState>();
+
+// Provider for the router
+final routerProvider = Provider<GoRouter>((ref) {
+  return GoRouter(
+    navigatorKey: rootNavigatorKey,
+    initialLocation: '/',
+    routes: [
+      ShellRoute(
+        navigatorKey: _shellNavigatorKey,
+        builder: (context, state, child) {
+          return AppWrapper(child: child);
+        },
+        routes: [
+          // Standalone routes without bottom navigation
+          GoRoute(
+            path: '/posts/compose',
+            builder:
+                (context, state) => PostComposeScreen(
+                  initialState: state.extra as PostComposeInitialState?,
+                ),
+          ),
+          GoRoute(
+            path: '/posts/:id/edit',
+            builder: (context, state) {
+              final id = state.pathParameters['id']!;
+              return PostEditScreen(id: id);
+            },
+          ),
+          GoRoute(
+            path: '/chat/:id/call',
+            builder: (context, state) {
+              final id = state.pathParameters['id']!;
+              return CallScreen(roomId: id);
+            },
+          ),
+          GoRoute(
+            path: '/account/:name/calendar',
+            builder: (context, state) {
+              final name = state.pathParameters['name']!;
+              return EventCalanderScreen(name: name);
+            },
+          ),
+          GoRoute(
+            path: '/creators',
+            builder: (context, state) => const CreatorHubScreen(),
+            routes: [
+              GoRoute(
+                path: ':name/posts',
+                builder: (context, state) {
+                  final name = state.pathParameters['name']!;
+                  return CreatorPostListScreen(pubName: name);
+                },
+              ),
+              GoRoute(
+                path: ':name/stickers',
+                builder: (context, state) {
+                  final name = state.pathParameters['name']!;
+                  return StickersScreen(pubName: name);
+                },
+              ),
+              GoRoute(
+                path: ':name/stickers/new',
+                builder: (context, state) {
+                  final name = state.pathParameters['name']!;
+                  return NewStickerPacksScreen(pubName: name);
+                },
+              ),
+              GoRoute(
+                path: ':name/stickers/:packId/edit',
+                builder: (context, state) {
+                  final name = state.pathParameters['name']!;
+                  final packId = state.pathParameters['packId']!;
+                  return EditStickerPacksScreen(pubName: name, packId: packId);
+                },
+              ),
+              GoRoute(
+                path: ':name/stickers/:packId',
+                builder: (context, state) {
+                  final name = state.pathParameters['name']!;
+                  final packId = state.pathParameters['packId']!;
+                  return StickerPackDetailScreen(pubName: name, id: packId);
+                },
+              ),
+              GoRoute(
+                path: ':name/stickers/:packId/new',
+                builder: (context, state) {
+                  final packId = state.pathParameters['packId']!;
+                  return NewStickersScreen(packId: packId);
+                },
+              ),
+              GoRoute(
+                path: ':name/stickers/:packId/:id/edit',
+                builder: (context, state) {
+                  final packId = state.pathParameters['packId']!;
+                  final id = state.pathParameters['id']!;
+                  return EditStickersScreen(id: id, packId: packId);
+                },
+              ),
+              GoRoute(
+                path: 'new',
+                builder: (context, state) => const NewPublisherScreen(),
+              ),
+              GoRoute(
+                path: ':name/edit',
+                builder: (context, state) {
+                  final name = state.pathParameters['name']!;
+                  return EditPublisherScreen(name: name);
+                },
+              ),
+            ],
+          ),
+
+          // Auth routes
+          GoRoute(
+            path: '/auth/login',
+            builder: (context, state) => const LoginScreen(),
+          ),
+          GoRoute(
+            path: '/auth/create-account',
+            builder: (context, state) => const CreateAccountScreen(),
+          ),
+
+          // Other routes
+          GoRoute(
+            path: '/settings',
+            builder: (context, state) => const SettingsScreen(),
+          ),
+
+          // Main tabs with TabsScreen shell
+          ShellRoute(
+            navigatorKey: _tabsShellKey,
+            builder: (context, state, child) {
+              return TabsScreen(child: child);
+            },
+            routes: [
+              // Explore tab
+              GoRoute(
+                path: '/',
+                builder: (context, state) => const ExploreScreen(),
+                routes: [
+                  GoRoute(
+                    path: 'posts/:id',
+                    builder: (context, state) {
+                      final id = state.pathParameters['id']!;
+                      return PostDetailScreen(id: id);
+                    },
+                  ),
+                  GoRoute(
+                    path: 'publishers/:name',
+                    builder: (context, state) {
+                      final name = state.pathParameters['name']!;
+                      return PublisherProfileScreen(name: name);
+                    },
+                  ),
+                  GoRoute(
+                    path: 'discovery/realms',
+                    builder: (context, state) => const DiscoveryRealmsScreen(),
+                  ),
+                ],
+              ),
+
+              // Chat tab
+              GoRoute(
+                path: '/chat',
+                builder: (context, state) => const ChatListScreen(),
+                routes: [
+                  GoRoute(
+                    path: 'new',
+                    builder: (context, state) => const NewChatScreen(),
+                  ),
+                  GoRoute(
+                    path: ':id',
+                    builder: (context, state) {
+                      final id = state.pathParameters['id']!;
+                      return ChatRoomScreen(id: id);
+                    },
+                  ),
+                  GoRoute(
+                    path: ':id/edit',
+                    builder: (context, state) {
+                      final id = state.pathParameters['id']!;
+                      return EditChatScreen(id: id);
+                    },
+                  ),
+                  GoRoute(
+                    path: ':id/detail',
+                    builder: (context, state) {
+                      final id = state.pathParameters['id']!;
+                      return ChatDetailScreen(id: id);
+                    },
+                  ),
+                ],
+              ),
+
+              // Realms tab
+              GoRoute(
+                path: '/realms',
+                builder: (context, state) => const RealmListScreen(),
+                routes: [
+                  GoRoute(
+                    path: 'new',
+                    builder: (context, state) => const NewRealmScreen(),
+                  ),
+                  GoRoute(
+                    path: ':slug',
+                    builder: (context, state) {
+                      final slug = state.pathParameters['slug']!;
+                      return RealmDetailScreen(slug: slug);
+                    },
+                  ),
+                  GoRoute(
+                    path: ':slug/edit',
+                    builder: (context, state) {
+                      final slug = state.pathParameters['slug']!;
+                      return EditRealmScreen(slug: slug);
+                    },
+                  ),
+                ],
+              ),
+
+              // Account tab
+              GoRoute(
+                path: '/account',
+                builder: (context, state) => const AccountScreen(),
+                routes: [
+                  GoRoute(
+                    path: 'notifications',
+                    builder: (context, state) => const NotificationScreen(),
+                  ),
+                  GoRoute(
+                    path: 'wallet',
+                    builder: (context, state) => const WalletScreen(),
+                  ),
+                  GoRoute(
+                    path: 'relationships',
+                    builder: (context, state) => const RelationshipScreen(),
+                  ),
+                  GoRoute(
+                    path: ':name',
+                    builder: (context, state) {
+                      final name = state.pathParameters['name']!;
+                      return AccountProfileScreen(name: name);
+                    },
+                  ),
+                  GoRoute(
+                    path: 'me/update',
+                    builder: (context, state) => const UpdateProfileScreen(),
+                  ),
+                  GoRoute(
+                    path: 'me/leveling',
+                    builder: (context, state) => const LevelingScreen(),
+                  ),
+                  GoRoute(
+                    path: 'settings',
+                    builder: (context, state) => const AccountSettingsScreen(),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ],
+      ),
+    ],
+  );
+});
+
+// Navigation helper functions
+class AppRouter {
+  static GoRouter of(BuildContext context) {
+    return GoRouter.of(context);
+  }
+
+  static void go(BuildContext context, String path) {
+    context.go(path);
+  }
+
+  static void push(BuildContext context, String path) {
+    context.push(path);
+  }
+
+  static void pop(BuildContext context) {
+    context.pop();
+  }
+
+  static bool canPop(BuildContext context) {
+    return context.canPop();
+  }
 }

lib/screens/account.dart

@@ -1,14 +1,13 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter/services.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/pods/message.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/pods/userinfo.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/screens/notification.dart';
 import 'package:island/services/responsive.dart';
 import 'package:island/widgets/account/account_name.dart';
@@ -19,9 +18,9 @@ import 'package:island/widgets/content/cloud_files.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:styled_widget/styled_widget.dart';
 
-@RoutePage()
 class AccountShellScreen extends HookConsumerWidget {
-  const AccountShellScreen({super.key});
+  final Widget child;
+  const AccountShellScreen({super.key, required this.child});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -34,17 +33,16 @@ class AccountShellScreen extends HookConsumerWidget {
           children: [
             Flexible(flex: 2, child: AccountScreen(isAside: true)),
             VerticalDivider(width: 1),
-            Flexible(flex: 3, child: AutoRouter()),
+            Flexible(flex: 3, child: child),
           ],
         ),
       );
     }
 
-    return AppBackground(isRoot: true, child: AutoRouter());
+    return AppBackground(isRoot: true, child: child);
   }
 }
 
-@RoutePage()
 class AccountScreen extends HookConsumerWidget {
   final bool isAside;
   const AccountScreen({super.key, this.isAside = false});
@@ -67,8 +65,9 @@ class AccountScreen extends HookConsumerWidget {
 
     return AppScaffold(
       noBackground: isWide,
-      appBar: AppBar(title: const Text('account').tr()),
+      appBar: AppBar(backgroundColor: Colors.transparent, toolbarHeight: 0),
       body: SingleChildScrollView(
+        padding: getTabbedPadding(context),
         child: Column(
           children: <Widget>[
             Card(
@@ -99,9 +98,7 @@ class AccountScreen extends HookConsumerWidget {
                           radius: 24,
                         ),
                         onTap: () {
-                          context.router.push(
-                            AccountProfileRoute(name: user.value!.name),
-                          );
+                          context.push('/account/${user.value!.name}');
                         },
                       ),
                       Expanded(
@@ -139,11 +136,16 @@ class AccountScreen extends HookConsumerWidget {
                 ],
               ),
             ).padding(horizontal: 8),
-            LevelingProgressCard(
-              level: user.value!.profile.level,
-              experience: user.value!.profile.experience,
-              progress: user.value!.profile.levelingProgress,
-            ).padding(horizontal: 8),
+            GestureDetector(
+              child: LevelingProgressCard(
+                level: user.value!.profile.level,
+                experience: user.value!.profile.experience,
+                progress: user.value!.profile.levelingProgress,
+              ),
+              onTap: () {
+                context.push('/account/leveling');
+              },
+            ).padding(horizontal: 12),
             Row(
               children: [
                 Expanded(
@@ -159,7 +161,7 @@ class AccountScreen extends HookConsumerWidget {
                         ],
                       ).padding(horizontal: 16, vertical: 12),
                       onTap: () {
-                        context.router.push(CreatorHubShellRoute());
+                        context.push('/creators');
                       },
                     ),
                   ).height(140),
@@ -198,7 +200,7 @@ class AccountScreen extends HookConsumerWidget {
                 ],
               ),
               onTap: () {
-                context.router.push(NotificationRoute());
+                context.push('/account/notifications');
               },
             ),
             ListTile(
@@ -208,7 +210,7 @@ class AccountScreen extends HookConsumerWidget {
               contentPadding: EdgeInsets.symmetric(horizontal: 24),
               title: Text('wallet').tr(),
               onTap: () {
-                context.router.push(WalletRoute());
+                context.push('/wallet');
               },
             ),
             ListTile(
@@ -218,7 +220,7 @@ class AccountScreen extends HookConsumerWidget {
               contentPadding: EdgeInsets.symmetric(horizontal: 24),
               title: Text('relationships').tr(),
               onTap: () {
-                context.router.push(RelationshipRoute());
+                context.push('/account/relationship');
               },
             ),
             const Divider(height: 1).padding(vertical: 8),
@@ -229,7 +231,7 @@ class AccountScreen extends HookConsumerWidget {
               contentPadding: EdgeInsets.symmetric(horizontal: 24),
               title: Text('appSettings').tr(),
               onTap: () {
-                context.router.push(SettingsRoute());
+                context.push('/settings');
               },
             ),
             ListTile(
@@ -239,7 +241,7 @@ class AccountScreen extends HookConsumerWidget {
               contentPadding: EdgeInsets.symmetric(horizontal: 24),
               title: Text('updateYourProfile').tr(),
               onTap: () {
-                context.router.push(UpdateProfileRoute());
+                context.push('/account/me/update');
               },
             ),
             ListTile(
@@ -249,7 +251,7 @@ class AccountScreen extends HookConsumerWidget {
               contentPadding: EdgeInsets.symmetric(horizontal: 24),
               title: Text('accountSettings').tr(),
               onTap: () {
-                context.router.push(AccountSettingsRoute());
+                context.push('/account/me/settings');
               },
             ),
             if (kDebugMode) const Divider(height: 1).padding(vertical: 8),
@@ -314,7 +316,7 @@ class _UnauthorizedAccountScreen extends StatelessWidget {
                   child: Card(
                     child: InkWell(
                       onTap: () {
-                        context.router.push(CreateAccountRoute());
+                        context.push('/auth/create');
                       },
                       child: Padding(
                         padding: const EdgeInsets.all(16),
@@ -336,7 +338,7 @@ class _UnauthorizedAccountScreen extends StatelessWidget {
                   child: Card(
                     child: InkWell(
                       onTap: () {
-                        context.router.push(LoginRoute());
+                        context.push('/auth/login');
                       },
                       child: Padding(
                         padding: const EdgeInsets.all(16),
@@ -355,7 +357,7 @@ class _UnauthorizedAccountScreen extends StatelessWidget {
                 const Gap(8),
                 TextButton(
                   onPressed: () {
-                    context.router.push(SettingsRoute());
+                    context.push('/settings');
                   },
                   child: Text('appSettings').tr(),
                 ).center(),

lib/screens/account/event_calendar.dart

@@ -1,4 +1,3 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
@@ -12,10 +11,9 @@ import 'package:island/widgets/account/event_calendar.dart';
 import 'package:island/widgets/account/fortune_graph.dart';
 import 'package:styled_widget/styled_widget.dart';
 
-@RoutePage()
 class EventCalanderScreen extends HookConsumerWidget {
   final String name;
-  const EventCalanderScreen({super.key, @PathParam("name") required this.name});
+  const EventCalanderScreen({super.key, required this.name});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -61,7 +59,7 @@ class EventCalanderScreen extends HookConsumerWidget {
                   child: Column(
                     children: [
                       Card(
-                        margin: EdgeInsets.all(16),
+                        margin: EdgeInsets.only(left: 16, right: 16, top: 16),
                         child: Column(
                           children: [
                             // Use the reusable EventCalendarWidget
@@ -77,7 +75,6 @@ class EventCalanderScreen extends HookConsumerWidget {
                       ),
 
                       // Add the fortune graph widget
-                      const Divider(height: 1),
                       FortuneGraphWidget(
                         events: events,
                         constrainWidth: true,

lib/screens/account/leveling.dart

@@ -0,0 +1,698 @@
+import 'package:dio/dio.dart';
+import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/wallet.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/pods/userinfo.dart';
+import 'package:island/services/responsive.dart';
+import 'package:island/services/time.dart';
+import 'package:island/widgets/account/leveling_progress.dart';
+import 'package:island/widgets/account/restore_purchase_sheet.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/app_scaffold.dart';
+import 'package:island/widgets/payment/payment_overlay.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+part 'leveling.g.dart';
+
+@riverpod
+Future<SnWalletSubscription?> accountStellarSubscription(Ref ref) async {
+  try {
+    final client = ref.watch(apiClientProvider);
+    final resp = await client.get('/subscriptions/fuzzy/solian.stellar');
+    return SnWalletSubscription.fromJson(resp.data);
+  } catch (err) {
+    if (err is DioException && err.response?.statusCode == 404) return null;
+    rethrow;
+  }
+}
+
+class LevelingScreen extends HookConsumerWidget {
+  const LevelingScreen({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final user = ref.watch(userInfoProvider);
+    final stellarSubscription = ref.watch(accountStellarSubscriptionProvider);
+
+    if (user.value == null) {
+      return AppScaffold(
+        appBar: AppBar(title: Text('levelingProgress'.tr())),
+        body: const Center(child: CircularProgressIndicator()),
+      );
+    }
+
+    final currentLevel = user.value!.profile.level;
+    final currentExp = user.value!.profile.experience;
+    final progress = user.value!.profile.levelingProgress;
+
+    return AppScaffold(
+      appBar: AppBar(title: Text('levelingProgress'.tr())),
+      body: SingleChildScrollView(
+        padding: getTabbedPadding(context, horizontal: 20, vertical: 20),
+        child: Center(
+          child: ConstrainedBox(
+            constraints: const BoxConstraints(maxWidth: 480),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                // Current Progress Card
+                LevelingProgressCard(
+                  level: currentLevel,
+                  experience: currentExp,
+                  progress: progress,
+                ),
+                const Gap(24),
+
+                // Level Stairs Graph
+                Text(
+                  'levelProgress'.tr(),
+                  style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+                const Gap(16),
+
+                // Stairs visualization with fixed height and horizontal scroll
+                _buildLevelStairs(context, currentLevel),
+
+                const Gap(24),
+
+                // Membership section
+                _buildMembershipSection(context, ref, stellarSubscription),
+                const Gap(16),
+
+                // Unlocked features section
+                Container(
+                  width: double.infinity,
+                  padding: const EdgeInsets.all(16),
+                  decoration: BoxDecoration(
+                    color: Theme.of(context).colorScheme.surfaceContainerHigh,
+                    borderRadius: BorderRadius.circular(12),
+                  ),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        'unlockedFeatures'.tr(),
+                        style: TextStyle(
+                          fontSize: 18,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                      const Gap(8),
+                      Text(
+                        'unlockedFeaturesDescription'.tr(),
+                        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                          color: Theme.of(context).colorScheme.onSurfaceVariant,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildLevelStairs(BuildContext context, int currentLevel) {
+    const totalLevels = 14;
+    const stairHeight = 20.0;
+    const stairWidth = 50.0;
+    const containerHeight = 280.0;
+
+    return Container(
+      height: containerHeight,
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.circular(12),
+        border: Border.all(
+          color: Theme.of(context).colorScheme.outline.withOpacity(0.2),
+        ),
+      ),
+      child: SingleChildScrollView(
+        scrollDirection: Axis.horizontal,
+        padding: const EdgeInsets.symmetric(horizontal: 16),
+        child: SizedBox(
+          width: (totalLevels * (stairWidth + 8)) + 40,
+          height: containerHeight,
+          child: CustomPaint(
+            painter: LevelStairsPainter(
+              currentLevel: currentLevel,
+              totalLevels: totalLevels,
+              primaryColor: Theme.of(context).colorScheme.primary,
+              surfaceColor: Theme.of(context).colorScheme.surfaceContainerHigh,
+              onSurfaceColor: Theme.of(context).colorScheme.onSurface,
+              stairHeight: stairHeight,
+              stairWidth: stairWidth,
+            ),
+            child: Stack(
+              children: List.generate(totalLevels, (index) {
+                final level = index + 1;
+                final isCompleted = level <= currentLevel;
+                final isCurrent = level == currentLevel;
+
+                // Calculate position from bottom
+                final bottomPosition = 0.0;
+                final leftPosition = 20.0 + (index * (stairWidth + 8));
+
+                // Make higher levels progressively taller
+                final progressiveHeight =
+                    40.0 + (index * 15.0); // Base height + progressive increase
+
+                return Positioned(
+                  left: leftPosition,
+                  bottom: bottomPosition,
+                  child: Container(
+                    width: stairWidth,
+                    height: progressiveHeight,
+                    decoration: BoxDecoration(
+                      color:
+                          isCompleted
+                              ? Theme.of(context).colorScheme.primary
+                              : Theme.of(
+                                context,
+                              ).colorScheme.surfaceContainerHigh,
+                      borderRadius: const BorderRadius.only(
+                        topLeft: Radius.circular(6),
+                        topRight: Radius.circular(6),
+                      ),
+                      border:
+                          isCurrent
+                              ? Border.all(
+                                color: Theme.of(context).colorScheme.primary,
+                                width: 2,
+                              )
+                              : null,
+                      boxShadow:
+                          isCurrent
+                              ? [
+                                BoxShadow(
+                                  color: Theme.of(
+                                    context,
+                                  ).colorScheme.primary.withOpacity(0.3),
+                                  blurRadius: 6,
+                                  spreadRadius: 1,
+                                ),
+                              ]
+                              : null,
+                    ),
+                    child: Padding(
+                      padding: const EdgeInsets.only(top: 8),
+                      child: Column(
+                        children: [
+                          Text(
+                            level.toString(),
+                            style: GoogleFonts.robotoMono(
+                              fontSize: 14,
+                              fontWeight: FontWeight.bold,
+                              color:
+                                  isCompleted
+                                      ? Theme.of(context).colorScheme.onPrimary
+                                      : Theme.of(context).colorScheme.onSurface,
+                            ),
+                          ),
+                          if (isCurrent) ...[
+                            const Gap(4),
+                            Container(
+                              width: 4,
+                              height: 4,
+                              decoration: BoxDecoration(
+                                color: Theme.of(context).colorScheme.onPrimary,
+                                shape: BoxShape.circle,
+                              ),
+                            ),
+                          ],
+                        ],
+                      ),
+                    ),
+                  ),
+                );
+              }),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildMembershipSection(
+    BuildContext context,
+    WidgetRef ref,
+    AsyncValue<SnWalletSubscription?> stellarSubscriptionAsync,
+  ) {
+    return stellarSubscriptionAsync.when(
+      data: (membership) => _buildMembershipContent(context, ref, membership),
+      loading:
+          () => Container(
+            width: double.infinity,
+            padding: const EdgeInsets.all(16),
+            decoration: BoxDecoration(
+              gradient: LinearGradient(
+                colors: [
+                  Theme.of(context).colorScheme.primaryContainer,
+                  Theme.of(context).colorScheme.secondaryContainer,
+                ],
+                begin: Alignment.topLeft,
+                end: Alignment.bottomRight,
+              ),
+              borderRadius: BorderRadius.circular(12),
+            ),
+            child: const Center(child: CircularProgressIndicator()),
+          ),
+      error:
+          (error, stack) => Container(
+            width: double.infinity,
+            padding: const EdgeInsets.all(16),
+            decoration: BoxDecoration(
+              gradient: LinearGradient(
+                colors: [
+                  Theme.of(context).colorScheme.primaryContainer,
+                  Theme.of(context).colorScheme.secondaryContainer,
+                ],
+                begin: Alignment.topLeft,
+                end: Alignment.bottomRight,
+              ),
+              borderRadius: BorderRadius.circular(12),
+            ),
+            child: Text('Error loading membership: $error'),
+          ),
+    );
+  }
+
+  Widget _buildMembershipContent(
+    BuildContext context,
+    WidgetRef ref,
+    SnWalletSubscription? membership,
+  ) {
+    final isActive = membership?.isActive ?? false;
+
+    return Container(
+      width: double.infinity,
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        gradient: LinearGradient(
+          colors: [
+            Theme.of(context).colorScheme.primaryContainer,
+            Theme.of(context).colorScheme.secondaryContainer,
+          ],
+          begin: Alignment.topLeft,
+          end: Alignment.bottomRight,
+        ),
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              Icon(
+                isActive ? Icons.star : Icons.star_border,
+                color: Theme.of(context).colorScheme.primary,
+                size: 24,
+              ),
+              const Gap(8),
+              Text(
+                'stellarMembership'.tr(),
+                style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+              ),
+            ],
+          ),
+          const Gap(12),
+
+          if (isActive) ...[
+            _buildCurrentMembershipCard(context, membership!),
+            const Gap(16),
+          ],
+
+          Text(
+            isActive ? 'upgradeYourPlan'.tr() : 'chooseYourPlan'.tr(),
+            style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600),
+          ),
+          const Gap(12),
+
+          _buildMembershipTiers(context, ref, membership),
+          const Gap(12),
+
+          // Restore Purchase Button
+          OutlinedButton.icon(
+            onPressed: () => _showRestorePurchaseSheet(context, ref),
+            icon: const Icon(Icons.restore),
+            label: Text('restorePurchase'.tr()),
+            style: OutlinedButton.styleFrom(
+              minimumSize: const Size(double.infinity, 48),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildCurrentMembershipCard(
+    BuildContext context,
+    SnWalletSubscription membership,
+  ) {
+    final tierName = _getMembershipTierName(membership.identifier);
+    final tierColor = _getMembershipTierColor(context, membership.identifier);
+
+    return Container(
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: tierColor.withOpacity(0.1),
+        borderRadius: BorderRadius.circular(8),
+        border: Border.all(color: tierColor, width: 1),
+      ),
+      child: Row(
+        children: [
+          Icon(Icons.verified, color: tierColor, size: 20),
+          const Gap(8),
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  'currentMembership'.tr(args: [tierName]),
+                  style: TextStyle(
+                    fontSize: 14,
+                    fontWeight: FontWeight.w600,
+                    color: tierColor,
+                  ),
+                ),
+                if (membership.endedAt != null)
+                  Text(
+                    'membershipExpires'.tr(
+                      args: [membership.endedAt!.formatSystem()],
+                    ),
+                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                      color: Theme.of(context).colorScheme.onSurfaceVariant,
+                    ),
+                  ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildMembershipTiers(
+    BuildContext context,
+    WidgetRef ref,
+    SnWalletSubscription? currentMembership,
+  ) {
+    final tiers = [
+      {
+        'id': 'solian.stellar.primary',
+        'name': 'membershipTierStellar'.tr(),
+        'price': 'membershipPriceStellar'.tr(),
+        'features': [
+          'membershipFeatureBasic'.tr(),
+          'membershipFeaturePrioritySupport'.tr(),
+          'membershipFeatureAdFree'.tr(),
+        ],
+        'color': Colors.blue,
+      },
+      {
+        'id': 'solian.stellar.nova',
+        'name': 'membershipTierNova'.tr(),
+        'price': 'membershipPriceNova'.tr(),
+        'features': [
+          'membershipFeatureAllPrimary'.tr(),
+          'membershipFeatureAdvancedCustomization'.tr(),
+          'membershipFeatureEarlyAccess'.tr(),
+        ],
+        'color': Colors.purple,
+      },
+      {
+        'id': 'solian.stellar.supernova',
+        'name': 'membershipTierSupernova'.tr(),
+        'price': 'membershipPriceSupernova'.tr(),
+        'features': [
+          'membershipFeatureAllNova'.tr(),
+          'membershipFeatureExclusiveContent'.tr(),
+          'membershipFeatureVipSupport'.tr(),
+        ],
+        'color': Colors.orange,
+      },
+    ];
+
+    return Column(
+      children:
+          tiers.map((tier) {
+            final isCurrentTier = currentMembership?.identifier == tier['id'];
+            final tierColor = tier['color'] as Color;
+
+            return Container(
+              margin: const EdgeInsets.only(bottom: 8),
+              child: Material(
+                color: Colors.transparent,
+                child: InkWell(
+                  onTap:
+                      isCurrentTier
+                          ? null
+                          : () => _purchaseMembership(
+                            context,
+                            ref,
+                            tier['id'] as String,
+                          ),
+                  borderRadius: BorderRadius.circular(8),
+                  child: Container(
+                    padding: const EdgeInsets.all(12),
+                    decoration: BoxDecoration(
+                      color:
+                          isCurrentTier
+                              ? tierColor.withOpacity(0.1)
+                              : Theme.of(context).colorScheme.surface,
+                      borderRadius: BorderRadius.circular(8),
+                      border: Border.all(
+                        color:
+                            isCurrentTier
+                                ? tierColor
+                                : Theme.of(
+                                  context,
+                                ).colorScheme.outline.withOpacity(0.2),
+                        width: isCurrentTier ? 2 : 1,
+                      ),
+                    ),
+                    child: Row(
+                      children: [
+                        Container(
+                          width: 4,
+                          height: 40,
+                          decoration: BoxDecoration(
+                            color: tierColor,
+                            borderRadius: BorderRadius.circular(2),
+                          ),
+                        ),
+                        const Gap(12),
+                        Expanded(
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Row(
+                                children: [
+                                  Text(
+                                    tier['name'] as String,
+                                    style: TextStyle(
+                                      fontSize: 16,
+                                      fontWeight: FontWeight.w600,
+                                      color: isCurrentTier ? tierColor : null,
+                                    ),
+                                  ),
+                                  const Gap(8),
+                                  if (isCurrentTier)
+                                    Container(
+                                      padding: const EdgeInsets.symmetric(
+                                        horizontal: 6,
+                                        vertical: 2,
+                                      ),
+                                      decoration: BoxDecoration(
+                                        color: tierColor,
+                                        borderRadius: BorderRadius.circular(4),
+                                      ),
+                                      child: Text(
+                                        'membershipCurrentBadge'.tr(),
+                                        style: TextStyle(
+                                          fontSize: 10,
+                                          fontWeight: FontWeight.bold,
+                                          color: Colors.white,
+                                        ),
+                                      ),
+                                    ),
+                                ],
+                              ),
+                              Text(
+                                tier['price'] as String,
+                                style: Theme.of(
+                                  context,
+                                ).textTheme.bodyMedium?.copyWith(
+                                  color:
+                                      Theme.of(
+                                        context,
+                                      ).colorScheme.onSurfaceVariant,
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                        if (!isCurrentTier)
+                          Icon(
+                            Icons.arrow_forward_ios,
+                            size: 16,
+                            color:
+                                Theme.of(context).colorScheme.onSurfaceVariant,
+                          ),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+            );
+          }).toList(),
+    );
+  }
+
+  String _getMembershipTierName(String identifier) {
+    switch (identifier) {
+      case 'solian.stellar.primary':
+        return 'membershipTierStellar'.tr();
+      case 'solian.stellar.nova':
+        return 'membershipTierNova'.tr();
+      case 'solian.stellar.supernova':
+        return 'membershipTierSupernova'.tr();
+      default:
+        return 'membershipTierUnknown'.tr();
+    }
+  }
+
+  Color _getMembershipTierColor(BuildContext context, String identifier) {
+    switch (identifier) {
+      case 'solian.stellar.primary':
+        return Colors.blue;
+      case 'solian.stellar.nova':
+        return Colors.purple;
+      case 'solian.stellar.supernova':
+        return Colors.orange;
+      default:
+        return Theme.of(context).colorScheme.primary;
+    }
+  }
+
+  Future<void> _showRestorePurchaseSheet(
+    BuildContext context,
+    WidgetRef ref,
+  ) async {
+    await showModalBottomSheet(
+      context: context,
+      builder: (context) => const RestorePurchaseSheet(),
+    );
+  }
+
+  Future<void> _purchaseMembership(
+    BuildContext context,
+    WidgetRef ref,
+    String tierId,
+  ) async {
+    final client = ref.watch(apiClientProvider);
+    try {
+      showLoadingModal(context);
+      final resp = await client.post(
+        '/subscriptions',
+        data: {
+          'identifier': tierId,
+          'payment_method': 'solian.wallet',
+          'payment_details': {'currency': 'golds'},
+          'cycle_duration_days': 30,
+        },
+        options: Options(headers: {'X-Noop': true}),
+      );
+      final subscription = SnWalletSubscription.fromJson(resp.data);
+      if (subscription.status == 1) return;
+      final orderResp = await client.post(
+        '/subscriptions/${subscription.identifier}/order',
+      );
+      final order = SnWalletOrder.fromJson(orderResp.data);
+
+      if (context.mounted) hideLoadingModal(context);
+
+      // Show payment overlay to complete the payment
+      if (!context.mounted) return;
+      final paidOrder = await PaymentOverlay.show(
+        context: context,
+        order: order,
+        enableBiometric: true,
+      );
+
+      if (context.mounted) showLoadingModal(context);
+
+      if (paidOrder != null) {
+        await client.post(
+          '/subscriptions/order/handle',
+          data: {'order_id': paidOrder.id},
+        );
+
+        ref.invalidate(accountStellarSubscriptionProvider);
+        ref.read(userInfoProvider.notifier).fetchUser();
+        if (context.mounted) {
+          showSnackBar('membershipPurchaseSuccess'.tr());
+        }
+      }
+    } catch (err) {
+      showErrorAlert(err);
+    } finally {
+      if (context.mounted) hideLoadingModal(context);
+    }
+  }
+}
+
+class LevelStairsPainter extends CustomPainter {
+  final int currentLevel;
+  final int totalLevels;
+  final Color primaryColor;
+  final Color surfaceColor;
+  final Color onSurfaceColor;
+  final double stairHeight;
+  final double stairWidth;
+
+  LevelStairsPainter({
+    required this.currentLevel,
+    required this.totalLevels,
+    required this.primaryColor,
+    required this.surfaceColor,
+    required this.onSurfaceColor,
+    required this.stairHeight,
+    required this.stairWidth,
+  });
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final paint =
+        Paint()
+          ..color = surfaceColor.withOpacity(0.2)
+          ..strokeWidth = 1.5
+          ..style = PaintingStyle.stroke;
+
+    // Draw connecting lines between stairs
+    for (int i = 0; i < totalLevels - 1; i++) {
+      final startX = 20.0 + (i * (stairWidth + 8)) + stairWidth;
+      final startHeight =
+          40.0 + (i * 15.0); // Progressive height for current stair
+      final startY = size.height - (20.0 + startHeight);
+
+      final endX = 20.0 + ((i + 1) * (stairWidth + 8));
+      final endHeight =
+          40.0 + ((i + 1) * 15.0); // Progressive height for next stair
+      final endY = size.height - (20.0 + endHeight);
+
+      canvas.drawLine(Offset(startX, startY), Offset(endX, endY), paint);
+    }
+  }
+
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
+}

lib/screens/account/leveling.g.dart

@@ -0,0 +1,31 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'leveling.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$accountStellarSubscriptionHash() =>
+    r'37fb821460e3ac50b5cf777c933b6779f732daee';
+
+/// See also [accountStellarSubscription].
+@ProviderFor(accountStellarSubscription)
+final accountStellarSubscriptionProvider =
+    AutoDisposeFutureProvider<SnWalletSubscription?>.internal(
+      accountStellarSubscription,
+      name: r'accountStellarSubscriptionProvider',
+      debugGetCreateSourceHash:
+          const bool.fromEnvironment('dart.vm.product')
+              ? null
+              : _$accountStellarSubscriptionHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+typedef AccountStellarSubscriptionRef =
+    AutoDisposeFutureProviderRef<SnWalletSubscription?>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/screens/account/me/settings.dart

@@ -1,6 +1,5 @@
 import 'dart:io';
 
-import 'package:auto_route/annotations.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -51,7 +50,6 @@ Future<List<SnAccountConnection>> accountConnections(Ref ref) async {
       .toList();
 }
 
-@RoutePage()
 class AccountSettingsScreen extends HookConsumerWidget {
   const AccountSettingsScreen({super.key});
 
@@ -72,7 +70,7 @@ class AccountSettingsScreen extends HookConsumerWidget {
         final client = ref.read(apiClientProvider);
         await client.delete('/accounts/me');
         if (context.mounted) {
-          showSnackBar(context, 'accountDeletionSent'.tr());
+          showSnackBar('accountDeletionSent'.tr());
         }
       } catch (err) {
         showErrorAlert(err);
@@ -100,7 +98,7 @@ class AccountSettingsScreen extends HookConsumerWidget {
           data: {'account': userInfo.value!.name, 'captcha_token': captchaTk},
         );
         if (context.mounted) {
-          showSnackBar(context, 'accountPasswordChangeSent'.tr());
+          showSnackBar('accountPasswordChangeSent'.tr());
         }
       } catch (err) {
         showErrorAlert(err);
@@ -470,7 +468,7 @@ class AccountSettingsScreen extends HookConsumerWidget {
               ),
             ),
           ],
-        ).padding(horizontal: 16);
+        );
       } else {
         // Single column layout for narrow screens
         return Column(

lib/screens/account/me/settings_auth_factors.dart

@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:math' as math;
 
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -138,13 +139,13 @@ class AuthFactorSheet extends HookConsumerWidget {
                 children: [
                   if (factor.enabledAt == null)
                     Badge(
-                      label: Text('authFactorDisabled'.tr()),
+                      label: Text('authFactorDisabled').tr(),
                       textColor: Theme.of(context).colorScheme.onSecondary,
                       backgroundColor: Theme.of(context).colorScheme.secondary,
                     )
                   else
                     Badge(
-                      label: Text('authFactorEnabled'.tr()),
+                      label: Text('authFactorEnabled').tr(),
                       textColor: Theme.of(context).colorScheme.onPrimary,
                       backgroundColor: Theme.of(context).colorScheme.primary,
                     ),
@@ -204,7 +205,7 @@ class AuthFactorNewSheet extends HookConsumerWidget {
             builder: (context) => AuthFactorNewAdditonalSheet(factor: factor),
           ).then((_) {
             if (context.mounted) {
-              showSnackBar(context, 'contactMethodVerificationNeeded'.tr());
+              showSnackBar('contactMethodVerificationNeeded'.tr());
             }
             if (context.mounted) Navigator.pop(context, true);
           });
@@ -217,6 +218,8 @@ class AuthFactorNewSheet extends HookConsumerWidget {
       }
     }
 
+    final width = math.min(400, MediaQuery.of(context).size.width);
+
     return SheetScaffold(
       titleText: 'authFactorNew'.tr(),
       child: Column(
@@ -248,7 +251,7 @@ class AuthFactorNewSheet extends HookConsumerWidget {
               }
             },
           ),
-          if (factorType.value == 0)
+          if ([0].contains(factorType.value))
             TextField(
               controller: secretController,
               decoration: InputDecoration(
@@ -259,6 +262,20 @@ class AuthFactorNewSheet extends HookConsumerWidget {
               ),
               onTapOutside:
                   (_) => FocusManager.instance.primaryFocus?.unfocus(),
+            )
+          else if ([4].contains(factorType.value))
+            OtpTextField(
+              showCursor: false,
+              numberOfFields: 6,
+              obscureText: false,
+              showFieldAsBox: true,
+              focusedBorderColor: Theme.of(context).colorScheme.primary,
+              fieldWidth: (width / 6) - 10,
+              keyboardType: TextInputType.number,
+              onSubmit: (String verificationCode) {
+                secretController.text = verificationCode;
+              },
+              textStyle: Theme.of(context).textTheme.titleLarge!,
             ),
           Padding(
             padding: const EdgeInsets.symmetric(horizontal: 16.0),

lib/screens/account/me/settings_connections.dart

@@ -28,6 +28,7 @@ Widget getProviderIcon(String provider, {double size = 24, Color? color}) {
     case 'google':
     case 'github':
     case 'discord':
+    case 'afdian':
       return SvgPicture.asset(
         'assets/images/oidc/$providerLower.svg',
         width: size,
@@ -51,6 +52,8 @@ String getLocalizedProviderName(String provider) {
       return 'accountConnectionProviderGithub'.tr();
     case 'discord':
       return 'accountConnectionProviderDiscord'.tr();
+    case 'afdian':
+      return 'accountConnectionProviderAfdian'.tr();
     default:
       return provider;
   }
@@ -82,52 +85,54 @@ class AccountConnectionSheet extends HookConsumerWidget {
 
     return SheetScaffold(
       titleText: 'accountConnections'.tr(),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.stretch,
-        children: [
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              getProviderIcon(
-                connection.provider,
-                size: 32,
-                color: Theme.of(context).colorScheme.onSurface,
-              ),
-              const Gap(8),
-              Text(getLocalizedProviderName(connection.provider)).tr(),
-              const Gap(4),
-              if (connection.meta.isNotEmpty)
-                Column(
-                  crossAxisAlignment: CrossAxisAlignment.stretch,
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    for (final meta in connection.meta.entries)
-                      Text(
-                        '${meta.key.replaceAll('_', ' ').capitalizeEachWord()}: ${meta.value}',
-                        style: const TextStyle(fontSize: 12),
-                      ),
-                  ],
+      child: SingleChildScrollView(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                getProviderIcon(
+                  connection.provider,
+                  size: 32,
+                  color: Theme.of(context).colorScheme.onSurface,
                 ),
-              Text(
-                connection.providedIdentifier,
-                style: Theme.of(context).textTheme.bodySmall,
-              ),
-              const Gap(8),
-              Text(
-                connection.lastUsedAt.formatSystem(),
-                style: Theme.of(context).textTheme.bodySmall,
-              ).opacity(0.85),
-            ],
-          ).padding(all: 20),
-          const Divider(height: 1),
-          ListTile(
-            leading: const Icon(Symbols.delete),
-            title: Text('accountConnectionDelete').tr(),
-            onTap: deleteConnection,
-            contentPadding: const EdgeInsets.symmetric(horizontal: 20),
-          ),
-        ],
+                const Gap(8),
+                Text(getLocalizedProviderName(connection.provider)).tr(),
+                const Gap(4),
+                if (connection.meta.isNotEmpty)
+                  Column(
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      for (final meta in connection.meta.entries)
+                        Text(
+                          '${meta.key.replaceAll('_', ' ').capitalizeEachWord()}: ${meta.value}',
+                          style: const TextStyle(fontSize: 12),
+                        ),
+                    ],
+                  ),
+                Text(
+                  connection.providedIdentifier,
+                  style: Theme.of(context).textTheme.bodySmall,
+                ),
+                const Gap(8),
+                Text(
+                  connection.lastUsedAt.formatSystem(),
+                  style: Theme.of(context).textTheme.bodySmall,
+                ).opacity(0.85),
+              ],
+            ).padding(all: 20),
+            const Divider(height: 1),
+            ListTile(
+              leading: const Icon(Symbols.delete),
+              title: Text('accountConnectionDelete').tr(),
+              onTap: deleteConnection,
+              contentPadding: const EdgeInsets.symmetric(horizontal: 20),
+            ),
+          ],
+        ),
       ),
     );
   }
@@ -141,7 +146,14 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
     final selectedProvider = useState<String>('apple');
 
     // List of available providers
-    final providers = ['apple', 'microsoft', 'google', 'github', 'discord'];
+    final providers = [
+      'apple',
+      'microsoft',
+      'google',
+      'github',
+      'discord',
+      'afdian',
+    ];
 
     Future<void> addConnection() async {
       final client = ref.watch(apiClientProvider);
@@ -169,7 +181,7 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
               },
             );
             if (context.mounted) {
-              showSnackBar(context, 'accountConnectionAddSuccess'.tr());
+              showSnackBar('accountConnectionAddSuccess'.tr());
               Navigator.pop(context, true);
             }
           } catch (err) {
@@ -182,7 +194,8 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
         case 'google':
         case 'github':
         case 'discord':
-          await Navigator.of(context).push(
+        case 'afdian':
+          await Navigator.of(context, rootNavigator: true).push(
             MaterialPageRoute(
               builder:
                   (context) => OidcScreen(
@@ -195,59 +208,63 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
           if (context.mounted) Navigator.pop(context, true);
           break;
         default:
-          showSnackBar(context, 'accountConnectionAddError'.tr());
+          showSnackBar('accountConnectionAddError'.tr());
           return;
       }
     }
 
     return SheetScaffold(
       titleText: 'accountConnectionAdd'.tr(),
-      child: Column(
-        spacing: 16,
-        crossAxisAlignment: CrossAxisAlignment.stretch,
-        children: [
-          DropdownButtonFormField<String>(
-            value: selectedProvider.value,
-            decoration: InputDecoration(
-              prefixIcon: getProviderIcon(
-                selectedProvider.value,
-                size: 16,
-                color: Theme.of(context).colorScheme.onSurface,
-              ).padding(all: 16),
-              labelText: 'accountConnectionProvider'.tr(),
-              border: const OutlineInputBorder(),
-            ),
-            items:
-                providers.map((String provider) {
-                  return DropdownMenuItem<String>(
-                    value: provider,
-                    child: Row(
-                      children: [Text(getLocalizedProviderName(provider)).tr()],
-                    ),
-                  );
-                }).toList(),
-            onChanged: (String? newValue) {
-              if (newValue != null) {
-                selectedProvider.value = newValue;
-              }
-            },
-          ),
-          Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 16.0),
-            child: Text('accountConnectionDescription'.tr()),
-          ),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.end,
-            children: [
-              TextButton.icon(
-                onPressed: addConnection,
-                icon: const Icon(Symbols.add),
-                label: Text('next').tr(),
+      child: SingleChildScrollView(
+        child: Column(
+          spacing: 16,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            DropdownButtonFormField<String>(
+              value: selectedProvider.value,
+              decoration: InputDecoration(
+                prefixIcon: getProviderIcon(
+                  selectedProvider.value,
+                  size: 16,
+                  color: Theme.of(context).colorScheme.onSurface,
+                ).padding(all: 16),
+                labelText: 'accountConnectionProvider'.tr(),
+                border: const OutlineInputBorder(),
               ),
-            ],
-          ),
-        ],
-      ).padding(horizontal: 20, vertical: 24),
+              items:
+                  providers.map((String provider) {
+                    return DropdownMenuItem<String>(
+                      value: provider,
+                      child: Row(
+                        children: [
+                          Text(getLocalizedProviderName(provider)).tr(),
+                        ],
+                      ),
+                    );
+                  }).toList(),
+              onChanged: (String? newValue) {
+                if (newValue != null) {
+                  selectedProvider.value = newValue;
+                }
+              },
+            ),
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 16.0),
+              child: Text('accountConnectionDescription'.tr()),
+            ),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                TextButton.icon(
+                  onPressed: addConnection,
+                  icon: const Icon(Symbols.add),
+                  label: Text('next').tr(),
+                ),
+              ],
+            ),
+          ],
+        ).padding(horizontal: 20, vertical: 24),
+      ),
     );
   }
 }

lib/screens/account/me/settings_contacts.dart

@@ -40,7 +40,7 @@ class ContactMethodSheet extends HookConsumerWidget {
         final client = ref.read(apiClientProvider);
         await client.post('/accounts/me/contacts/${contact.id}/verify');
         if (context.mounted) {
-          showSnackBar(context, 'contactMethodVerificationSent'.tr());
+          showSnackBar('contactMethodVerificationSent'.tr());
         }
       } catch (err) {
         showErrorAlert(err);
@@ -152,7 +152,7 @@ class ContactMethodNewSheet extends HookConsumerWidget {
 
     Future<void> addContactMethod() async {
       if (contentController.text.isEmpty) {
-        showSnackBar(context, 'contactMethodContentEmpty'.tr());
+        showSnackBar('contactMethodContentEmpty'.tr());
         return;
       }
 
@@ -164,7 +164,7 @@ class ContactMethodNewSheet extends HookConsumerWidget {
           data: {'type': contactType.value, 'content': contentController.text},
         );
         if (context.mounted) {
-          showSnackBar(context, 'contactMethodVerificationNeeded'.tr());
+          showSnackBar('contactMethodVerificationNeeded'.tr());
           Navigator.pop(context, true);
         }
       } catch (err) {

lib/screens/account/me/update.dart

@@ -1,4 +1,3 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:croppy/croppy.dart' hide cropImage;
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -20,7 +19,6 @@ import 'package:styled_widget/styled_widget.dart';
 
 const kServerSupportedLanguages = {'en-US': 'en-us', 'zh-CN': 'zh-hans'};
 
-@RoutePage()
 class UpdateProfileScreen extends HookConsumerWidget {
   const UpdateProfileScreen({super.key});
 

lib/screens/account/profile.dart

@@ -1,7 +1,7 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/chat.dart';
@@ -96,13 +96,9 @@ Future<SnRelationship?> accountRelationship(Ref ref, String uname) async {
   }
 }
 
-@RoutePage()
 class AccountProfileScreen extends HookConsumerWidget {
   final String name;
-  const AccountProfileScreen({
-    super.key,
-    @PathParam("name") required this.name,
-  });
+  const AccountProfileScreen({super.key, required this.name});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -142,7 +138,7 @@ class AccountProfileScreen extends HookConsumerWidget {
     Future<void> directMessageAction() async {
       if (!account.hasValue) return;
       if (accountChat.value != null) {
-        context.router.pushPath('/chat/${accountChat.value!.id}');
+        context.push('/chat/${accountChat.value!.id}');
         return;
       }
       showLoadingModal(context);
@@ -153,7 +149,7 @@ class AccountProfileScreen extends HookConsumerWidget {
           data: {'related_user_id': account.value!.id},
         );
         final chat = SnChatRoom.fromJson(resp.data);
-        if (context.mounted) context.router.pushPath('/chat/${chat.id}');
+        if (context.mounted) context.push('/chat/${chat.id}');
         ref.invalidate(accountDirectChatProvider(name));
       } catch (err) {
         showErrorAlert(err);
@@ -278,7 +274,10 @@ class AccountProfileScreen extends HookConsumerWidget {
                             children: [
                               Row(
                                 children: [
-                                  Text(data.nick).fontSize(20),
+                                  AccountName(
+                                    account: data,
+                                    style: TextStyle(fontSize: 20),
+                                  ),
                                   const Gap(6),
                                   Text(
                                     '@${data.name}',

lib/screens/account/relationship.dart

@@ -1,4 +1,3 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -204,7 +203,6 @@ class RelationshipListTile extends StatelessWidget {
   }
 }
 
-@RoutePage()
 class RelationshipScreen extends HookConsumerWidget {
   const RelationshipScreen({super.key});
 
@@ -217,6 +215,7 @@ class RelationshipScreen extends HookConsumerWidget {
     Future<void> addFriend() async {
       final result = await showModalBottomSheet(
         context: context,
+        useRootNavigator: true,
         builder: (context) => AccountPickerSheet(),
       );
       if (result == null) return;
@@ -242,12 +241,10 @@ class RelationshipScreen extends HookConsumerWidget {
         if (!context.mounted) return;
         if (isAccept) {
           showSnackBar(
-            context,
             'friendRequestAccepted'.tr(args: ['@${relationship.account.name}']),
           );
         } else {
           showSnackBar(
-            context,
             'friendRequestDeclined'.tr(args: ['@${relationship.account.name}']),
           );
         }

lib/screens/auth/create_account.dart

@@ -1,12 +1,11 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:email_validator/email_validator.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/pods/network.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/screens/account/me/update.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
@@ -16,7 +15,6 @@ import 'package:url_launcher/url_launcher_string.dart';
 
 import 'captcha.dart';
 
-@RoutePage()
 class CreateAccountScreen extends HookConsumerWidget {
   const CreateAccountScreen({super.key});
 
@@ -307,7 +305,7 @@ class _PostCreateModal extends HookConsumerWidget {
             TextButton(
               onPressed: () {
                 Navigator.pop(context);
-                context.router.replace(LoginRoute());
+                context.pushReplacement('/auth/login');
               },
               child: Text('login'.tr()),
             ),

lib/screens/auth/login.dart

@@ -3,7 +3,6 @@ import 'dart:io';
 import 'dart:math' as math;
 
 import 'package:animations/animations.dart';
-import 'package:auto_route/auto_route.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -40,9 +39,9 @@ final Map<int, (String, String, IconData)> kFactorTypes = {
     Symbols.notifications_active,
   ),
   3: ('authFactorTOTP', 'authFactorTOTPDescription', Symbols.timer),
+  4: ('authFactorPin', 'authFactorPinDescription', Symbols.nest_secure_alarm),
 };
 
-@RoutePage()
 class LoginScreen extends HookConsumerWidget {
   const LoginScreen({super.key});
 
@@ -426,7 +425,7 @@ class _LoginPickerScreen extends HookConsumerWidget {
           onPickFactor(factors!.where((x) => x == factorPicked.value).first);
           onNext();
           if (context.mounted) {
-            showSnackBar(context, err.response!.data.toString());
+            showSnackBar(err.response!.data.toString());
           }
           return;
         }
@@ -651,7 +650,7 @@ class _LoginLookupScreen extends HookConsumerWidget {
     }
 
     Future<void> withOidc(String provider) async {
-      final challengeId = await Navigator.of(context).push(
+      final challengeId = await Navigator.of(context, rootNavigator: true).push(
         MaterialPageRoute(
           builder: (context) => OidcScreen(provider: provider.toLowerCase()),
         ),

lib/screens/auth/oidc.native.dart

@@ -10,6 +10,7 @@ import 'package:gap/gap.dart';
 import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/services/udid.dart';
+import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:styled_widget/styled_widget.dart';
 
@@ -204,15 +205,11 @@ class _OidcScreenState extends ConsumerState<OidcScreen> {
                       onPressed: () {
                         if (currentUrl != null) {
                           Clipboard.setData(ClipboardData(text: currentUrl!));
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(
-                              content: Text('copyToClipboard').tr(),
-                              duration: const Duration(seconds: 1),
-                            ),
-                          );
+                          showSnackBar('copyToClipboard');
                         }
                       },
                     ),
+                    const Gap(8),
                   ],
                 ),
               ),

lib/screens/auth/tabs.dart

@@ -1,161 +0,0 @@
-import 'dart:developer';
-
-import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:gap/gap.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/route.dart';
-import 'package:island/route.gr.dart';
-import 'package:island/screens/notification.dart';
-import 'package:island/services/responsive.dart';
-import 'package:material_symbols_icons/symbols.dart';
-
-final currentRouteProvider = StateProvider<String?>((ref) => null);
-
-class TabNavigationObserver extends AutoRouterObserver {
-  Function(String?) onChange;
-  TabNavigationObserver({required this.onChange});
-
-  @override
-  void didPush(Route route, Route? previousRoute) {
-    log('pushed ${previousRoute?.settings.name} -> ${route.settings.name}');
-    if (route is DialogRoute) return;
-    Future(() {
-      onChange(route.settings.name);
-    });
-  }
-
-  @override
-  void didPop(Route route, Route? previousRoute) {
-    log('popped ${route.settings.name} -> ${previousRoute?.settings.name}');
-    if (route is DialogRoute) return;
-    Future(() {
-      onChange(previousRoute?.settings.name);
-    });
-  }
-}
-
-@RoutePage()
-class TabsNavigationWidget extends HookConsumerWidget {
-  final Widget child;
-  final AppRouter router;
-  const TabsNavigationWidget({
-    super.key,
-    required this.child,
-    required this.router,
-  });
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final useHorizontalLayout = isWideScreen(context);
-    final currentRoute = ref.watch(currentRouteProvider);
-
-    final notificationUnreadCount = ref.watch(
-      notificationUnreadCountNotifierProvider,
-    );
-
-    int activeIndex = 0;
-
-    final destinations = [
-      NavigationDestination(
-        label: 'explore'.tr(),
-        icon: const Icon(Symbols.explore),
-      ),
-      NavigationDestination(label: 'chat'.tr(), icon: const Icon(Symbols.chat)),
-      NavigationDestination(
-        label: 'realms'.tr(),
-        icon: const Icon(Symbols.workspaces),
-      ),
-      NavigationDestination(
-        label: 'account'.tr(),
-        icon: Badge.count(
-          count: notificationUnreadCount.value ?? 0,
-          isLabelVisible: (notificationUnreadCount.value ?? 0) > 0,
-          child: const Icon(Symbols.account_circle),
-        ),
-      ),
-    ];
-
-    final routes = <PageRouteInfo>[
-      ExploreRoute(),
-      ChatListRoute(),
-      RealmListRoute(),
-      AccountRoute(),
-    ];
-    final routeNames = [
-      ExploreRoute.name,
-      ExploreShellRoute.name,
-      ChatListRoute.name,
-      RealmListRoute.name,
-      AccountRoute.name,
-      ChatShellRoute.name,
-      AccountShellRoute.name,
-    ];
-
-    activeIndex = routes.indexWhere((route) => route.routeName == currentRoute);
-    if (activeIndex == -1) {
-      activeIndex = 0;
-    }
-
-    final isTabRoute = routeNames.any((route) {
-      return route == currentRoute;
-    });
-
-    return Scaffold(
-      extendBodyBehindAppBar: true,
-      backgroundColor: Colors.transparent,
-      body:
-          useHorizontalLayout
-              ? Row(
-                children: [
-                  ColoredBox(
-                    color: Theme.of(context).colorScheme.surface,
-                    child: Column(
-                      children: [
-                        Gap(MediaQuery.of(context).padding.top + 8),
-                        Expanded(
-                          child: NavigationRail(
-                            selectedIndex: activeIndex,
-                            onDestinationSelected: (index) {
-                              router.replace(routes[index]);
-                            },
-                            // labelType: NavigationRailLabelType.all,
-                            destinations:
-                                destinations
-                                    .map(
-                                      (d) => NavigationRailDestination(
-                                        icon: d.icon,
-                                        label: Text(d.label),
-                                      ),
-                                    )
-                                    .toList(),
-                          ),
-                        ),
-                        Gap(MediaQuery.of(context).padding.bottom + 8),
-                      ],
-                    ),
-                  ),
-                  VerticalDivider(
-                    color: Theme.of(context).dividerColor,
-                    width: 1 / MediaQuery.of(context).devicePixelRatio,
-                  ),
-                  Expanded(child: child),
-                ],
-              )
-              : child,
-      bottomNavigationBar:
-          !useHorizontalLayout && isTabRoute
-              ? NavigationBar(
-                height: 56,
-                labelBehavior: NavigationDestinationLabelBehavior.alwaysHide,
-                selectedIndex: activeIndex,
-                onDestinationSelected: (index) {
-                  router.replace(routes[index]);
-                },
-                destinations: destinations,
-              )
-              : null,
-    );
-  }
-}

lib/screens/chat/call.dart

@@ -1,4 +1,3 @@
-import 'package:auto_route/annotations.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
@@ -11,12 +10,12 @@ import 'package:island/widgets/chat/call_button.dart';
 import 'package:island/widgets/chat/call_overlay.dart';
 import 'package:island/widgets/chat/call_participant_tile.dart';
 import 'package:livekit_client/livekit_client.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:styled_widget/styled_widget.dart';
 
-@RoutePage()
 class CallScreen extends HookConsumerWidget {
   final String roomId;
-  const CallScreen({super.key, @PathParam('id') required this.roomId});
+  const CallScreen({super.key, required this.roomId});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -32,37 +31,9 @@ class CallScreen extends HookConsumerWidget {
     final viewMode = useState<String>('grid');
 
     return AppScaffold(
+      noBackground: false,
       appBar: AppBar(
-        leading: PageBackButton(
-          onWillPop: () {
-            showDialog<void>(
-              context: context,
-              builder: (context) {
-                return AlertDialog(
-                  content: const Text(
-                    'Do you want to leave the call or leave it in background?',
-                  ),
-                  actions: [
-                    TextButton(
-                      onPressed: () {
-                        Navigator.of(context).pop();
-                      },
-                      child: const Text('In Background'),
-                    ),
-                    TextButton(
-                      onPressed: () async {
-                        Navigator.of(context).pop();
-                        await callNotifier.disconnect();
-                        callNotifier.dispose();
-                      },
-                      child: const Text('Leave'),
-                    ),
-                  ],
-                );
-              },
-            );
-          },
-        ),
+        leading: PageBackButton(),
         title: Column(
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
@@ -83,7 +54,7 @@ class CallScreen extends HookConsumerWidget {
             mainAxisAlignment: MainAxisAlignment.end,
             children: [
               IconButton(
-                icon: Icon(Icons.grid_view),
+                icon: Icon(Symbols.grid_view),
                 tooltip: 'Grid View',
                 onPressed: () => viewMode.value = 'grid',
                 color:
@@ -92,7 +63,7 @@ class CallScreen extends HookConsumerWidget {
                         : null,
               ),
               IconButton(
-                icon: Icon(Icons.view_agenda),
+                icon: Icon(Symbols.view_agenda),
                 tooltip: 'Stage View',
                 onPressed: () => viewMode.value = 'stage',
                 color:

lib/screens/chat/chat.dart

@@ -1,9 +1,9 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:collection/collection.dart';
 import 'package:croppy/croppy.dart' hide cropImage;
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -15,7 +15,6 @@ import 'package:island/pods/call.dart';
 import 'package:island/pods/chat_summary.dart';
 import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/screens/realm/realms.dart';
 import 'package:island/services/file.dart';
 import 'package:island/services/responsive.dart';
@@ -27,6 +26,7 @@ import 'package:island/widgets/content/cloud_files.dart';
 import 'package:island/widgets/content/sheet.dart';
 import 'package:island/widgets/realms/selection_dropdown.dart';
 import 'package:island/widgets/response.dart';
+import 'package:island/screens/tabs.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:relative_time/relative_time.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -172,9 +172,9 @@ Future<List<SnChatRoom>> chatroomsJoined(Ref ref) async {
       .toList();
 }
 
-@RoutePage()
 class ChatShellScreen extends HookConsumerWidget {
-  const ChatShellScreen({super.key});
+  final Widget child;
+  const ChatShellScreen({super.key, required this.child});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -186,18 +186,17 @@ class ChatShellScreen extends HookConsumerWidget {
         child: Row(
           children: [
             Flexible(flex: 2, child: ChatListScreen(isAside: true)),
-            VerticalDivider(width: 1),
-            Flexible(flex: 4, child: AutoRouter()),
+            const VerticalDivider(width: 1),
+            Flexible(flex: 4, child: child),
           ],
         ),
       );
     }
 
-    return AppBackground(isRoot: true, child: AutoRouter());
+    return AppBackground(isRoot: true, child: child);
   }
 }
 
-@RoutePage()
 class ChatListScreen extends HookConsumerWidget {
   final bool isAside;
   const ChatListScreen({super.key, this.isAside = false});
@@ -228,7 +227,8 @@ class ChatListScreen extends HookConsumerWidget {
     Future<void> createDirectMessage() async {
       final result = await showModalBottomSheet(
         context: context,
-        builder: (context) => AccountPickerSheet(),
+        useRootNavigator: true,
+        builder: (context) => const AccountPickerSheet(),
       );
       if (result == null) return;
       final client = ref.read(apiClientProvider);
@@ -241,8 +241,9 @@ class ChatListScreen extends HookConsumerWidget {
     }
 
     return AppScaffold(
+      extendBody: false, // Prevent conflicts with tabs navigation
       appBar: AppBar(
-        title: Text('chat').tr(),
+        title: const Text('chat').tr(),
         bottom: TabBar(
           controller: tabController,
           tabs: [
@@ -296,7 +297,7 @@ class ChatListScreen extends HookConsumerWidget {
               showModalBottomSheet(
                 isScrollControlled: true,
                 context: context,
-                builder: (context) => _ChatInvitesSheet(),
+                builder: (context) => const _ChatInvitesSheet(),
               );
             },
           ),
@@ -307,17 +308,18 @@ class ChatListScreen extends HookConsumerWidget {
         onPressed: () {
           showModalBottomSheet(
             context: context,
+            useRootNavigator: true,
             builder:
                 (context) => Column(
                   mainAxisSize: MainAxisSize.min,
                   crossAxisAlignment: CrossAxisAlignment.stretch,
                   children: [
                     ListTile(
-                      title: Text('createChatRoom').tr(),
+                      title: const Text('createChatRoom').tr(),
                       leading: const Icon(Symbols.add),
                       onTap: () {
                         Navigator.pop(context);
-                        context.pushRoute(NewChatRoute()).then((value) {
+                        context.push('/chat/new').then((value) {
                           if (value != null) {
                             ref.invalidate(chatroomsJoinedProvider);
                           }
@@ -325,7 +327,7 @@ class ChatListScreen extends HookConsumerWidget {
                       },
                     ),
                     ListTile(
-                      title: Text('createDirectMessage').tr(),
+                      title: const Text('createDirectMessage').tr(),
                       leading: const Icon(Symbols.person),
                       onTap: () {
                         Navigator.pop(context);
@@ -339,6 +341,7 @@ class ChatListScreen extends HookConsumerWidget {
         },
         child: const Icon(Symbols.add),
       ),
+      floatingActionButtonLocation: TabbedFabLocation(context),
       body: Stack(
         children: [
           Column(
@@ -365,10 +368,10 @@ class ChatListScreen extends HookConsumerWidget {
                               ref.invalidate(chatroomsJoinedProvider);
                             }),
                         child: ListView.builder(
-                          padding:
-                              callState.isConnected
-                                  ? EdgeInsets.only(bottom: 96)
-                                  : EdgeInsets.zero,
+                          padding: getTabbedPadding(
+                            context,
+                            bottom: callState.isConnected ? 96 : null,
+                          ),
                           itemCount:
                               items
                                   .where(
@@ -397,16 +400,7 @@ class ChatListScreen extends HookConsumerWidget {
                               room: item,
                               isDirect: item.type == 1,
                               onTap: () {
-                                if (context.router.topRoute.name ==
-                                    ChatRoomRoute.name) {
-                                  context.router.replace(
-                                    ChatRoomRoute(id: item.id),
-                                  );
-                                } else {
-                                  context.router.push(
-                                    ChatRoomRoute(id: item.id),
-                                  );
-                                }
+                                context.push('/chat/${item.id}');
                               },
                             );
                           },
@@ -428,7 +422,7 @@ class ChatListScreen extends HookConsumerWidget {
           Positioned(
             left: 0,
             right: 0,
-            bottom: 0,
+            bottom: getTabbedPadding(context).bottom + 8,
             child: const CallOverlayBar().padding(horizontal: 16, vertical: 12),
           ),
         ],
@@ -440,33 +434,45 @@ class ChatListScreen extends HookConsumerWidget {
 @riverpod
 Future<SnChatRoom?> chatroom(Ref ref, String? identifier) async {
   if (identifier == null) return null;
-  final client = ref.watch(apiClientProvider);
-  final resp = await client.get('/chat/$identifier');
-  return SnChatRoom.fromJson(resp.data);
+  try {
+    final client = ref.watch(apiClientProvider);
+    final resp = await client.get('/chat/$identifier');
+    return SnChatRoom.fromJson(resp.data);
+  } catch (err) {
+    if (err is DioException && err.response?.statusCode == 404) {
+      return null; // Chat room not found
+    }
+    rethrow; // Rethrow other errors
+  }
 }
 
 @riverpod
 Future<SnChatMember?> chatroomIdentity(Ref ref, String? identifier) async {
   if (identifier == null) return null;
-  final client = ref.watch(apiClientProvider);
-  final resp = await client.get('/chat/$identifier/members/me');
-  return SnChatMember.fromJson(resp.data);
+  try {
+    final client = ref.watch(apiClientProvider);
+    final resp = await client.get('/chat/$identifier/members/me');
+    return SnChatMember.fromJson(resp.data);
+  } catch (err) {
+    if (err is DioException && err.response?.statusCode == 404) {
+      return null; // Chat member not found
+    }
+    rethrow; // Rethrow other errors
+  }
 }
 
-@RoutePage()
 class NewChatScreen extends StatelessWidget {
   const NewChatScreen({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return EditChatScreen();
+    return const EditChatScreen();
   }
 }
 
-@RoutePage()
 class EditChatScreen extends HookConsumerWidget {
   final String? id;
-  const EditChatScreen({super.key, @PathParam("id") this.id});
+  const EditChatScreen({super.key, this.id});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -478,6 +484,8 @@ class EditChatScreen extends HookConsumerWidget {
     final descriptionController = useTextEditingController();
     final picture = useState<SnCloudFile?>(null);
     final background = useState<SnCloudFile?>(null);
+    final isPublic = useState(true);
+    final isCommunity = useState(false);
 
     final chat = ref.watch(chatroomProvider(id));
 
@@ -490,12 +498,14 @@ class EditChatScreen extends HookConsumerWidget {
         descriptionController.text = chat.value!.description ?? '';
         picture.value = chat.value!.picture;
         background.value = chat.value!.background;
+        isPublic.value = chat.value!.isPublic;
+        isCommunity.value = chat.value!.isCommunity;
         currentRealm.value = joinedRealms.value?.firstWhereOrNull(
           (realm) => realm.id == chat.value!.realmId,
         );
       }
       return;
-    }, [chat]);
+    }, [chat, joinedRealms]);
 
     void setPicture(String position) async {
       showLoadingModal(context);
@@ -513,9 +523,9 @@ class EditChatScreen extends HookConsumerWidget {
         image: result,
         allowedAspectRatios: [
           if (position == 'background')
-            CropAspectRatio(height: 7, width: 16)
+            const CropAspectRatio(height: 7, width: 16)
           else
-            CropAspectRatio(height: 1, width: 1),
+            const CropAspectRatio(height: 1, width: 1),
         ],
       );
       if (result == null) {
@@ -572,11 +582,13 @@ class EditChatScreen extends HookConsumerWidget {
             'background_id': background.value?.id,
             'picture_id': picture.value?.id,
             'realm_id': currentRealm.value?.id,
+            'is_public': isPublic.value,
+            'is_community': isCommunity.value,
           },
           options: Options(method: id == null ? 'POST' : 'PATCH'),
         );
         if (context.mounted) {
-          context.maybePop(SnChatRoom.fromJson(resp.data));
+          context.pop(SnChatRoom.fromJson(resp.data));
         }
       } catch (err) {
         showErrorAlert(err);
@@ -664,6 +676,19 @@ class EditChatScreen extends HookConsumerWidget {
                       (_) => FocusManager.instance.primaryFocus?.unfocus(),
                 ),
                 const SizedBox(height: 16),
+                CheckboxListTile(
+                  title: const Text('isPublic').tr(),
+                  subtitle: const Text('isPublicHint').tr(),
+                  value: isPublic.value,
+                  onChanged: (value) => isPublic.value = value ?? false,
+                ),
+                CheckboxListTile(
+                  title: const Text('isCommunity').tr(),
+                  subtitle: const Text('isCommunityHint').tr(),
+                  value: isCommunity.value,
+                  onChanged: (value) => isCommunity.value = value ?? false,
+                ),
+                const SizedBox(height: 16),
                 Align(
                   alignment: Alignment.centerRight,
                   child: TextButton.icon(
@@ -764,7 +789,7 @@ class _ChatInvitesSheet extends HookConsumerWidget {
                               ),
                               if (invite.chatRoom!.type == 1)
                                 Badge(
-                                  label: Text('directMessage').tr(),
+                                  label: const Text('directMessage').tr(),
                                   backgroundColor:
                                       Theme.of(context).colorScheme.primary,
                                   textColor:

lib/screens/chat/chat.g.dart

@@ -25,7 +25,7 @@ final chatroomsJoinedProvider =
 @Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
 typedef ChatroomsJoinedRef = AutoDisposeFutureProviderRef<List<SnChatRoom>>;
-String _$chatroomHash() => r'dce3c0fc407f178bb7c306a08b9fa545795a9205';
+String _$chatroomHash() => r'8dac7aaac50932e6dd213039102d43c1cf5f1d4e';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -164,7 +164,7 @@ class _ChatroomProviderElement
   String? get identifier => (origin as ChatroomProvider).identifier;
 }
 
-String _$chatroomIdentityHash() => r'4c349ea4265df7b0498cf26c82dbaabe3d868727';
+String _$chatroomIdentityHash() => r'ad6ad09b6fc4cf7c4abe146ea97f8e364a3d4fd0';
 
 /// See also [chatroomIdentity].
 @ProviderFor(chatroomIdentity)

lib/screens/chat/room.dart

@@ -1,10 +1,10 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
@@ -18,7 +18,6 @@ import 'package:island/pods/config.dart';
 import 'package:island/pods/database.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/pods/websocket.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/services/responsive.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
@@ -288,15 +287,76 @@ class MessagesNotifier extends _$MessagesNotifier {
   }
 }
 
-@RoutePage()
 class ChatRoomScreen extends HookConsumerWidget {
   final String id;
-  const ChatRoomScreen({super.key, @PathParam("id") required this.id});
+  const ChatRoomScreen({super.key, required this.id});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final chatRoom = ref.watch(chatroomProvider(id));
     final chatIdentity = ref.watch(chatroomIdentityProvider(id));
+
+    if (chatIdentity.isLoading || chatRoom.isLoading) {
+      return AppScaffold(
+        appBar: AppBar(leading: const PageBackButton()),
+        body: CircularProgressIndicator().center(),
+      );
+    } else if (chatIdentity.value == null) {
+      // Identity was not found, user was not joined
+      return AppScaffold(
+        appBar: AppBar(leading: const PageBackButton()),
+        body: Center(
+          child:
+              ConstrainedBox(
+                constraints: const BoxConstraints(maxWidth: 280),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Icon(
+                      chatRoom.value?.isCommunity == true
+                          ? Symbols.person_add
+                          : Symbols.person_remove,
+                      size: 36,
+                      fill: 1,
+                    ).padding(bottom: 4),
+                    Text('chatNotJoined').tr(),
+                    if (chatRoom.value?.isCommunity != true)
+                      Text(
+                        'chatUnableJoin',
+                        textAlign: TextAlign.center,
+                      ).tr().bold()
+                    else
+                      FilledButton.tonalIcon(
+                        onPressed: () async {
+                          try {
+                            showLoadingModal(context);
+                            final apiClient = ref.read(apiClientProvider);
+                            if (chatRoom.value == null) {
+                              hideLoadingModal(context);
+                              return;
+                            }
+
+                            await apiClient.post(
+                              '/chat/${chatRoom.value!.id}/members/me',
+                            );
+                            ref.invalidate(chatroomIdentityProvider(id));
+                          } catch (err) {
+                            showErrorAlert(err);
+                          } finally {
+                            if (context.mounted) hideLoadingModal(context);
+                          }
+                        },
+                        label: Text('chatJoin').tr(),
+                        icon: const Icon(Icons.add),
+                      ).padding(top: 8),
+                  ],
+                ),
+              ).center(),
+        ),
+      );
+    }
+
     final messages = ref.watch(messagesNotifierProvider(id));
     final messagesNotifier = ref.read(messagesNotifierProvider(id).notifier);
     final ws = ref.watch(websocketProvider);
@@ -431,6 +491,28 @@ class ChatRoomScreen extends HookConsumerWidget {
       return () => subscription.cancel();
     }, [ws, chatRoom]);
 
+    useEffect(() {
+      final wsState = ref.read(websocketStateProvider.notifier);
+      wsState.sendMessage(
+        jsonEncode(
+          WebSocketPacket(
+            type: 'messages.subscribe',
+            data: {'chat_room_id': id},
+          ),
+        ),
+      );
+      return () {
+        wsState.sendMessage(
+          jsonEncode(
+            WebSocketPacket(
+              type: 'messages.unsubscribe',
+              data: {'chat_room_id': id},
+            ),
+          ),
+        );
+      };
+    }, [id]);
+
     Future<void> pickPhotoMedia() async {
       final result = await ref
           .watch(imagePickerProvider)
@@ -605,7 +687,7 @@ class ChatRoomScreen extends HookConsumerWidget {
           IconButton(
             icon: const Icon(Icons.more_vert),
             onPressed: () {
-              context.router.push(ChatDetailRoute(id: id));
+              context.push('/chat/$id/detail');
             },
           ),
           const Gap(8),
@@ -917,8 +999,10 @@ class _ChatInput extends HookConsumerWidget {
     final isMobile = !kIsWeb && (Platform.isAndroid || Platform.isIOS);
 
     void send() {
-      inputFocusNode.requestFocus();
       onSend.call();
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        inputFocusNode.requestFocus();
+      });
     }
 
     Future<void> handlePaste() async {

lib/screens/chat/room_detail.dart

@@ -1,14 +1,13 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/chat.dart';
 import 'package:island/pods/network.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/screens/chat/chat.dart';
 import 'package:island/widgets/account/account_picker.dart';
 import 'package:island/widgets/alert.dart';
@@ -23,10 +22,9 @@ import 'package:styled_widget/styled_widget.dart';
 part 'room_detail.freezed.dart';
 part 'room_detail.g.dart';
 
-@RoutePage()
 class ChatDetailScreen extends HookConsumerWidget {
   final String id;
-  const ChatDetailScreen({super.key, @PathParam("id") required this.id});
+  const ChatDetailScreen({super.key, required this.id});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -49,7 +47,6 @@ class ChatDetailScreen extends HookConsumerWidget {
         ref.invalidate(chatroomIdentityProvider(id));
         if (context.mounted) {
           showSnackBar(
-            context,
             'chatNotifyLevelUpdated'.tr(args: [kNotifyLevelText[level].tr()]),
           );
         }
@@ -140,7 +137,7 @@ class ChatDetailScreen extends HookConsumerWidget {
                       setChatBreak(now);
                       Navigator.pop(context);
                       if (context.mounted) {
-                        showSnackBar(context, 'chatBreakCleared'.tr());
+                        showSnackBar('chatBreakCleared'.tr());
                       }
                     },
                   ),
@@ -152,7 +149,7 @@ class ChatDetailScreen extends HookConsumerWidget {
                       setChatBreak(now.add(const Duration(minutes: 5)));
                       Navigator.pop(context);
                       if (context.mounted) {
-                        showSnackBar(context, 'chatBreakSet'.tr(args: ['5m']));
+                        showSnackBar('chatBreakSet'.tr(args: ['5m']));
                       }
                     },
                   ),
@@ -164,7 +161,7 @@ class ChatDetailScreen extends HookConsumerWidget {
                       setChatBreak(now.add(const Duration(minutes: 10)));
                       Navigator.pop(context);
                       if (context.mounted) {
-                        showSnackBar(context, 'chatBreakSet'.tr(args: ['10m']));
+                        showSnackBar('chatBreakSet'.tr(args: ['10m']));
                       }
                     },
                   ),
@@ -176,7 +173,7 @@ class ChatDetailScreen extends HookConsumerWidget {
                       setChatBreak(now.add(const Duration(minutes: 15)));
                       Navigator.pop(context);
                       if (context.mounted) {
-                        showSnackBar(context, 'chatBreakSet'.tr(args: ['15m']));
+                        showSnackBar('chatBreakSet'.tr(args: ['15m']));
                       }
                     },
                   ),
@@ -188,7 +185,7 @@ class ChatDetailScreen extends HookConsumerWidget {
                       setChatBreak(now.add(const Duration(minutes: 30)));
                       Navigator.pop(context);
                       if (context.mounted) {
-                        showSnackBar(context, 'chatBreakSet'.tr(args: ['30m']));
+                        showSnackBar('chatBreakSet'.tr(args: ['30m']));
                       }
                     },
                   ),
@@ -208,7 +205,6 @@ class ChatDetailScreen extends HookConsumerWidget {
                             Navigator.pop(context);
                             if (context.mounted) {
                               showSnackBar(
-                                context,
                                 'chatBreakSet'.tr(args: ['${minutes}m']),
                               );
                             }
@@ -393,7 +389,7 @@ class _ChatRoomActionMenu extends HookConsumerWidget {
             if ((chatIdentity.value?.role ?? 0) >= 50)
               PopupMenuItem(
                 onTap: () {
-                  context.router.replace(EditChatRoute(id: id));
+                  context.pushReplacement('/chat/$id/edit');
                 },
                 child: Row(
                   children: [
@@ -428,9 +424,7 @@ class _ChatRoomActionMenu extends HookConsumerWidget {
                       client.delete('/chat/$id');
                       ref.invalidate(chatroomsJoinedProvider);
                       if (context.mounted) {
-                        context.router.popUntil(
-                          (route) => route is ChatRoomRoute,
-                        );
+                        context.pop();
                       }
                     }
                   });
@@ -463,9 +457,7 @@ class _ChatRoomActionMenu extends HookConsumerWidget {
                       client.delete('/chat/$id/members/me');
                       ref.invalidate(chatroomsJoinedProvider);
                       if (context.mounted) {
-                        context.router.popUntil(
-                          (route) => route is ChatRoomRoute,
-                        );
+                        context.pop();
                       }
                     }
                   });
@@ -592,8 +584,8 @@ class _ChatMemberListSheet extends HookConsumerWidget {
 
     Future<void> invitePerson() async {
       final result = await showModalBottomSheet(
-        isScrollControlled: true,
         context: context,
+        useRootNavigator: true,
         builder: (context) => const AccountPickerSheet(),
       );
       if (result == null) return;

lib/screens/creators/hub.dart

@@ -1,13 +1,12 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/post.dart';
 import 'package:island/pods/network.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/screens/creators/publishers.dart';
 import 'package:island/services/responsive.dart';
 import 'package:island/widgets/alert.dart';
@@ -27,9 +26,9 @@ Future<SnPublisherStats?> publisherStats(Ref ref, String? uname) async {
   return SnPublisherStats.fromJson(resp.data);
 }
 
-@RoutePage()
 class CreatorHubShellScreen extends StatelessWidget {
-  const CreatorHubShellScreen({super.key});
+  final Widget child;
+  const CreatorHubShellScreen({super.key, required this.child});
 
   @override
   Widget build(BuildContext context) {
@@ -39,15 +38,14 @@ class CreatorHubShellScreen extends StatelessWidget {
         children: [
           SizedBox(width: 360, child: const CreatorHubScreen(isAside: true)),
           const VerticalDivider(width: 1),
-          Expanded(child: AutoRouter()),
+          Expanded(child: child),
         ],
       );
     }
-    return AutoRouter();
+    return child;
   }
 }
 
-@RoutePage()
 class CreatorHubScreen extends HookConsumerWidget {
   final bool isAside;
   const CreatorHubScreen({super.key, this.isAside = false});
@@ -65,8 +63,8 @@ class CreatorHubScreen extends HookConsumerWidget {
     );
 
     void updatePublisher() {
-      context.router
-          .push(EditPublisherRoute(name: currentPublisher.value!.name))
+      context
+          .push('/creators/${currentPublisher.value!.name}/edit')
           .then((value) async {
             if (value == null) return;
             final data = await ref.refresh(publishersManagedProvider.future);
@@ -123,6 +121,7 @@ class CreatorHubScreen extends HookConsumerWidget {
     );
 
     return AppScaffold(
+      noBackground: false,
       appBar: AppBar(
         leading: !isWide ? const PageBackButton() : null,
         title: Text('creatorHub').tr(),
@@ -222,7 +221,7 @@ class CreatorHubScreen extends HookConsumerWidget {
                             subtitle: Text('createPublisherHint').tr(),
                             trailing: const Icon(Symbols.chevron_right),
                             onTap: () {
-                              context.router.push(NewPublisherRoute()).then((
+                              context.push('/creators/publishers/new').then((
                                 value,
                               ) {
                                 if (value != null) {
@@ -248,10 +247,8 @@ class CreatorHubScreen extends HookConsumerWidget {
                               horizontal: 24,
                             ),
                             onTap: () {
-                              context.router.push(
-                                StickersRoute(
-                                  pubName: currentPublisher.value!.name,
-                                ),
+                              context.push(
+                                '/creators/${currentPublisher.value!.name}/stickers',
                               );
                             },
                           ),
@@ -264,10 +261,8 @@ class CreatorHubScreen extends HookConsumerWidget {
                               horizontal: 24,
                             ),
                             onTap: () {
-                              context.router.push(
-                                CreatorPostListRoute(
-                                  pubName: currentPublisher.value!.name,
-                                ),
+                              context.push(
+                                '/creators/${currentPublisher.value!.name}/posts',
                               );
                             },
                           ),

lib/screens/creators/posts/list.dart

@@ -1,6 +1,6 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/widgets/app_scaffold.dart';
@@ -8,13 +8,9 @@ import 'package:island/widgets/content/sheet.dart';
 import 'package:island/widgets/post/post_list.dart';
 import 'package:material_symbols_icons/symbols.dart';
 
-@RoutePage()
 class CreatorPostListScreen extends HookConsumerWidget {
   final String pubName;
-  const CreatorPostListScreen({
-    super.key,
-    @PathParam('name') required this.pubName,
-  });
+  const CreatorPostListScreen({super.key, required this.pubName});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -34,7 +30,7 @@ class CreatorPostListScreen extends HookConsumerWidget {
                     subtitle: Text('Create a regular post'),
                     onTap: () async {
                       Navigator.pop(context);
-                      final result = await context.router.pushPath(
+                      final result = await context.push(
                         '/posts/compose?type=0',
                       );
                       if (result == true) {
@@ -48,7 +44,7 @@ class CreatorPostListScreen extends HookConsumerWidget {
                     subtitle: Text('Create a detailed article'),
                     onTap: () async {
                       Navigator.pop(context);
-                      final result = await context.router.pushPath(
+                      final result = await context.push(
                         '/posts/compose?type=1',
                       );
                       if (result == true) {

lib/screens/creators/publishers.dart

@@ -1,10 +1,10 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:collection/collection.dart';
 import 'package:croppy/croppy.dart' hide cropImage;
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:island/models/file.dart';
@@ -15,6 +15,7 @@ import 'package:island/pods/network.dart';
 import 'package:island/pods/userinfo.dart';
 import 'package:island/screens/realm/realms.dart';
 import 'package:island/services/file.dart';
+import 'package:island/services/responsive.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/content/cloud_files.dart';
@@ -43,7 +44,6 @@ Future<SnPublisher?> publisher(Ref ref, String? identifier) async {
   return SnPublisher.fromJson(resp.data);
 }
 
-@RoutePage()
 class NewPublisherScreen extends StatelessWidget {
   const NewPublisherScreen({super.key});
 
@@ -53,10 +53,9 @@ class NewPublisherScreen extends StatelessWidget {
   }
 }
 
-@RoutePage()
 class EditPublisherScreen extends HookConsumerWidget {
   final String? name;
-  const EditPublisherScreen({super.key, @PathParam('id') this.name});
+  const EditPublisherScreen({super.key, this.name});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -176,7 +175,7 @@ class EditPublisherScreen extends HookConsumerWidget {
           options: Options(method: name == null ? 'POST' : 'PATCH'),
         );
         if (context.mounted) {
-          context.maybePop(SnPublisher.fromJson(resp.data));
+          context.pop(SnPublisher.fromJson(resp.data));
         }
       } catch (err) {
         showErrorAlert(err);
@@ -190,128 +189,140 @@ class EditPublisherScreen extends HookConsumerWidget {
         title: Text(name == null ? 'createPublisher' : 'editPublisher').tr(),
         leading: const PageBackButton(),
       ),
-      body: Column(
-        children: [
-          RealmSelectionDropdown(
-            value: currentRealm.value,
-            realms: joinedRealms.when(
-              data: (realms) => realms,
-              loading: () => [],
-              error: (_, _) => [],
+      body: SingleChildScrollView(
+        padding: getTabbedPadding(context, bottom: 16),
+        child: Column(
+          children: [
+            RealmSelectionDropdown(
+              value: currentRealm.value,
+              realms: joinedRealms.when(
+                data: (realms) => realms,
+                loading: () => [],
+                error: (_, _) => [],
+              ),
+              onChanged: (SnRealm? value) {
+                currentRealm.value = value;
+              },
+              isLoading: joinedRealms.isLoading,
+              error: joinedRealms.error?.toString(),
             ),
-            onChanged: (SnRealm? value) {
-              currentRealm.value = value;
-            },
-            isLoading: joinedRealms.isLoading,
-            error: joinedRealms.error?.toString(),
-          ),
-          AspectRatio(
-            aspectRatio: 16 / 7,
-            child: Stack(
-              clipBehavior: Clip.none,
-              fit: StackFit.expand,
-              children: [
-                GestureDetector(
-                  child: Container(
-                    color: Theme.of(context).colorScheme.surfaceContainerHigh,
-                    child:
-                        background.value != null
-                            ? CloudImageWidget(
-                              fileId: background.value!,
-                              fit: BoxFit.cover,
-                            )
-                            : const SizedBox.shrink(),
-                  ),
-                  onTap: () {
-                    setPicture('background');
-                  },
-                ),
-                Positioned(
-                  left: 20,
-                  bottom: -32,
-                  child: GestureDetector(
-                    child: ProfilePictureWidget(
-                      fileId: picture.value,
-                      radius: 40,
+            AspectRatio(
+              aspectRatio: 16 / 7,
+              child: Stack(
+                clipBehavior: Clip.none,
+                fit: StackFit.expand,
+                children: [
+                  GestureDetector(
+                    child: Container(
+                      color: Theme.of(context).colorScheme.surfaceContainerHigh,
+                      child:
+                          background.value != null
+                              ? CloudImageWidget(
+                                fileId: background.value!,
+                                fit: BoxFit.cover,
+                              )
+                              : const SizedBox.shrink(),
                     ),
                     onTap: () {
-                      setPicture('picture');
+                      setPicture('background');
                     },
                   ),
-                ),
-              ],
-            ),
-          ).padding(bottom: 32),
-          Form(
-            key: formKey,
-            child: Column(
-              spacing: 16,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                TextFormField(
-                  controller: nameController,
-                  decoration: InputDecoration(
-                    labelText: 'username'.tr(),
-                    helperText: 'usernameCannotChangeHint'.tr(),
-                    prefixText: '@',
-                  ),
-                  readOnly: name != null,
-                  onTapOutside:
-                      (_) => FocusManager.instance.primaryFocus?.unfocus(),
-                ),
-                TextFormField(
-                  controller: nickController,
-                  decoration: InputDecoration(labelText: 'nickname'.tr()),
-                  onTapOutside:
-                      (_) => FocusManager.instance.primaryFocus?.unfocus(),
-                ),
-                TextFormField(
-                  controller: bioController,
-                  decoration: InputDecoration(labelText: 'bio'.tr()),
-                  minLines: 3,
-                  maxLines: null,
-                  onTapOutside:
-                      (_) => FocusManager.instance.primaryFocus?.unfocus(),
-                ),
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    TextButton.icon(
-                      onPressed: () {
-                        if (currentRealm.value == null) {
-                          final user = ref.watch(userInfoProvider);
-                          nameController.text = user.value!.name;
-                          nickController.text = user.value!.nick;
-                          bioController.text = user.value!.profile.bio;
-                          picture.value = user.value!.profile.picture?.id;
-                          background.value = user.value!.profile.background?.id;
-                        } else {
-                          nameController.text = currentRealm.value!.slug;
-                          nickController.text = currentRealm.value!.name;
-                          bioController.text = currentRealm.value!.description;
-                          picture.value = currentRealm.value!.picture?.id;
-                          background.value = currentRealm.value!.background?.id;
-                        }
+                  Positioned(
+                    left: 20,
+                    bottom: -32,
+                    child: GestureDetector(
+                      child: ProfilePictureWidget(
+                        fileId: picture.value,
+                        radius: 40,
+                      ),
+                      onTap: () {
+                        setPicture('picture');
                       },
-                      label:
-                          Text(
-                            currentRealm.value == null
-                                ? 'syncPublisher'
-                                : 'syncPublisherRealm',
-                          ).tr(),
-                      icon: const Icon(Symbols.link),
                     ),
-                    TextButton.icon(
-                      onPressed: submitting.value ? null : performAction,
-                      label: Text(name == null ? 'create' : 'saveChanges').tr(),
-                      icon: const Icon(Symbols.save),
+                  ),
+                ],
+              ),
+            ).padding(bottom: 32),
+            Form(
+              key: formKey,
+              child: ConstrainedBox(
+                constraints: BoxConstraints(maxWidth: 480),
+                child: Column(
+                  spacing: 16,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    TextFormField(
+                      controller: nameController,
+                      decoration: InputDecoration(
+                        labelText: 'username'.tr(),
+                        helperText: 'usernameCannotChangeHint'.tr(),
+                        prefixText: '@',
+                      ),
+                      readOnly: name != null,
+                      onTapOutside:
+                          (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                    ),
+                    TextFormField(
+                      controller: nickController,
+                      decoration: InputDecoration(labelText: 'nickname'.tr()),
+                      onTapOutside:
+                          (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                    ),
+                    TextFormField(
+                      controller: bioController,
+                      decoration: InputDecoration(labelText: 'bio'.tr()),
+                      minLines: 3,
+                      maxLines: null,
+                      onTapOutside:
+                          (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                    ),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        TextButton.icon(
+                          onPressed: () {
+                            if (currentRealm.value == null) {
+                              final user = ref.watch(userInfoProvider);
+                              nameController.text = user.value!.name;
+                              nickController.text = user.value!.nick;
+                              bioController.text = user.value!.profile.bio;
+                              picture.value = user.value!.profile.picture?.id;
+                              background.value =
+                                  user.value!.profile.background?.id;
+                            } else {
+                              nameController.text = currentRealm.value!.slug;
+                              nickController.text = currentRealm.value!.name;
+                              bioController.text =
+                                  currentRealm.value!.description;
+                              picture.value = currentRealm.value!.picture?.id;
+                              background.value =
+                                  currentRealm.value!.background?.id;
+                            }
+                          },
+                          label:
+                              Text(
+                                currentRealm.value == null
+                                    ? 'syncPublisher'
+                                    : 'syncPublisherRealm',
+                              ).tr(),
+                          icon: const Icon(Symbols.link),
+                        ),
+                        TextButton.icon(
+                          onPressed: submitting.value ? null : performAction,
+                          label:
+                              Text(
+                                name == null ? 'create' : 'saveChanges',
+                              ).tr(),
+                          icon: const Icon(Symbols.save),
+                        ),
+                      ],
                     ),
                   ],
-                ),
-              ],
-            ).padding(horizontal: 24),
-          ),
-        ],
+                ).padding(horizontal: 24),
+              ).alignment(Alignment.topCenter),
+            ),
+          ],
+        ),
       ),
     );
   }

lib/screens/creators/stickers/pack_detail.dart

@@ -1,7 +1,7 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
@@ -10,7 +10,6 @@ import 'package:google_fonts/google_fonts.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/sticker.dart';
 import 'package:island/pods/network.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/screens/creators/stickers/stickers.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
@@ -34,14 +33,13 @@ Future<List<SnSticker>> stickerPackContent(Ref ref, String packId) async {
       .toList();
 }
 
-@RoutePage()
 class StickerPackDetailScreen extends HookConsumerWidget {
   final String id;
   final String pubName;
   const StickerPackDetailScreen({
     super.key,
-    @PathParam('name') required this.pubName,
-    @PathParam('packId') required this.id,
+    required this.pubName,
+    required this.id,
   });
 
   @override
@@ -76,7 +74,7 @@ class StickerPackDetailScreen extends HookConsumerWidget {
           IconButton(
             icon: const Icon(Symbols.add_circle),
             onPressed: () {
-              AutoRouter.of(context).push(NewStickersRoute(packId: id)).then((
+              context.push('/creators/stickers/$id/new').then((
                 value,
               ) {
                 if (value != null) {
@@ -175,12 +173,9 @@ class StickerPackDetailScreen extends HookConsumerWidget {
                                         title: 'edit'.tr(),
                                         image: MenuImage.icon(Symbols.edit),
                                         callback: () {
-                                          context.router
+                                          context
                                               .push(
-                                                EditStickersRoute(
-                                                  packId: id,
-                                                  id: sticker.id,
-                                                ),
+                                                '/creators/stickers/$id/edit/${sticker.id}',
                                               )
                                               .then((value) {
                                                 if (value != null) {
@@ -264,8 +259,8 @@ class _StickerPackActionMenu extends HookConsumerWidget {
           (context) => [
             PopupMenuItem(
               onTap: () {
-                context.router.push(
-                  EditStickerPacksRoute(pubName: pubName, packId: packId),
+                context.push(
+                  '/creators/$pubName/stickers/$packId/edit',
                 );
               },
               child: Row(
@@ -299,7 +294,7 @@ class _StickerPackActionMenu extends HookConsumerWidget {
                     final client = ref.watch(apiClientProvider);
                     client.delete('/stickers/$packId');
                     ref.invalidate(stickerPacksNotifierProvider);
-                    if (context.mounted) context.router.maybePop(true);
+                    if (context.mounted) context.pop(true);
                   }
                 });
               },
@@ -331,13 +326,9 @@ Future<SnSticker?> stickerPackSticker(
   return SnSticker.fromJson(resp.data);
 }
 
-@RoutePage()
 class NewStickersScreen extends StatelessWidget {
   final String packId;
-  const NewStickersScreen({
-    super.key,
-    @PathParam('packId') required this.packId,
-  });
+  const NewStickersScreen({super.key, required this.packId});
 
   @override
   Widget build(BuildContext context) {
@@ -345,15 +336,10 @@ class NewStickersScreen extends StatelessWidget {
   }
 }
 
-@RoutePage()
 class EditStickersScreen extends HookConsumerWidget {
   final String packId;
   final String? id;
-  const EditStickersScreen({
-    super.key,
-    @PathParam("packId") required this.packId,
-    @PathParam("id") required this.id,
-  });
+  const EditStickersScreen({super.key, required this.packId, required this.id});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {

lib/screens/creators/stickers/stickers.dart

@@ -1,13 +1,12 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/sticker.dart';
 import 'package:island/pods/network.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:material_symbols_icons/symbols.dart';
@@ -17,10 +16,9 @@ import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
 
 part 'stickers.g.dart';
 
-@RoutePage()
 class StickersScreen extends HookConsumerWidget {
   final String pubName;
-  const StickersScreen({super.key, @PathParam("name") required this.pubName});
+  const StickersScreen({super.key, required this.pubName});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -30,7 +28,7 @@ class StickersScreen extends HookConsumerWidget {
         actions: [
           IconButton(
             onPressed: () {
-              context.router.push(NewStickerPacksRoute(pubName: pubName)).then((
+              context.push('/creators/stickers/new?pubName=pubName').then((
                 value,
               ) {
                 if (value != null) {
@@ -73,8 +71,8 @@ class SliverStickerPacksList extends HookConsumerWidget {
                 subtitle: Text(sticker.description),
                 trailing: const Icon(Symbols.chevron_right),
                 onTap: () {
-                  context.router.push(
-                    StickerPackDetailRoute(pubName: pubName, id: sticker.id),
+                  context.push(
+                    '/creators/$pubName/stickers/${sticker.id}',
                   );
                 },
               );
@@ -137,13 +135,9 @@ Future<SnStickerPack?> stickerPack(Ref ref, String? packId) async {
   return SnStickerPack.fromJson(resp.data);
 }
 
-@RoutePage()
 class NewStickerPacksScreen extends HookConsumerWidget {
   final String pubName;
-  const NewStickerPacksScreen({
-    super.key,
-    @PathParam("name") required this.pubName,
-  });
+  const NewStickerPacksScreen({super.key, required this.pubName});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -151,15 +145,10 @@ class NewStickerPacksScreen extends HookConsumerWidget {
   }
 }
 
-@RoutePage()
 class EditStickerPacksScreen extends HookConsumerWidget {
   final String pubName;
   final String? packId;
-  const EditStickerPacksScreen({
-    super.key,
-    @PathParam("name") required this.pubName,
-    @PathParam("packId") this.packId,
-  });
+  const EditStickerPacksScreen({super.key, required this.pubName, this.packId});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -200,7 +189,7 @@ class EditStickerPacksScreen extends HookConsumerWidget {
           ),
         );
         if (!context.mounted) return;
-        context.router.maybePop(SnStickerPack.fromJson(resp.data));
+        context.pop(SnStickerPack.fromJson(resp.data));
       } catch (err) {
         showErrorAlert(err);
       } finally {

lib/screens/discovery/realms.dart

@@ -0,0 +1,64 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:gap/gap.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/widgets/app_scaffold.dart';
+import 'package:island/widgets/realm/realm_list.dart';
+import 'dart:async';
+
+class DiscoveryRealmsScreen extends HookConsumerWidget {
+  const DiscoveryRealmsScreen({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    Timer? debounceTimer;
+    final searchController = useTextEditingController();
+    final currentQuery = useState<String?>(null);
+
+    return AppScaffold(
+      appBar: AppBar(title: Text('discoverRealms'.tr())),
+      body: Stack(
+        children: [
+          CustomScrollView(
+            slivers: [
+              SliverGap(80),
+              SliverRealmList(
+                query: currentQuery.value,
+                key: ValueKey(currentQuery.value),
+              ),
+              SliverGap(MediaQuery.of(context).padding.bottom + 16),
+            ],
+          ),
+          Positioned(
+            top: 0,
+            left: 0,
+            right: 0,
+            child: Padding(
+              padding: const EdgeInsets.all(16),
+              child: SearchBar(
+                elevation: WidgetStateProperty.all(4),
+                controller: searchController,
+                hintText: 'search'.tr(),
+                leading: const Icon(Icons.search),
+                padding: WidgetStateProperty.all(
+                  const EdgeInsets.symmetric(horizontal: 24),
+                ),
+                onChanged: (value) {
+                  if (debounceTimer?.isActive ?? false) {
+                    debounceTimer?.cancel();
+                  }
+                  debounceTimer = Timer(const Duration(milliseconds: 300), () {
+                    if (currentQuery.value != value) {
+                      currentQuery.value = value;
+                    }
+                  });
+                },
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/screens/explore.dart

@@ -1,32 +1,36 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/activity.dart';
+import 'package:island/models/realm.dart';
 import 'package:island/pods/userinfo.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/services/responsive.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/models/post.dart';
 import 'package:island/widgets/check_in.dart';
 import 'package:island/widgets/post/post_item.dart';
-import 'package:island/widgets/tour/tour.dart';
+import 'package:island/screens/tabs.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
 import 'package:island/pods/network.dart';
+import 'package:island/widgets/realm/realm_card.dart';
+import 'package:island/widgets/publisher/publisher_card.dart';
 import 'package:styled_widget/styled_widget.dart';
 
 part 'explore.g.dart';
 
-@RoutePage()
-class ExploreShellScreen extends ConsumerWidget {
-  const ExploreShellScreen({super.key});
+class ExploreShellScreen extends HookConsumerWidget {
+  final Widget child;
+  const ExploreShellScreen({super.key, required this.child});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final isWide = isWideScreen(context);
+    final isWide = MediaQuery.of(context).size.width > 640;
 
     if (isWide) {
       return AppBackground(
@@ -35,18 +39,17 @@ class ExploreShellScreen extends ConsumerWidget {
           children: [
             Flexible(flex: 2, child: ExploreScreen(isAside: true)),
             VerticalDivider(width: 1),
-            Flexible(flex: 3, child: AutoRouter()),
+            Flexible(flex: 3, child: child),
           ],
         ),
       );
     }
 
-    return AppBackground(isRoot: true, child: AutoRouter());
+    return AppBackground(isRoot: true, child: child);
   }
 }
 
-@RoutePage()
-class ExploreScreen extends ConsumerWidget {
+class ExploreScreen extends HookConsumerWidget {
   final bool isAside;
   const ExploreScreen({super.key, this.isAside = false});
 
@@ -57,41 +60,173 @@ class ExploreScreen extends ConsumerWidget {
       return const EmptyPageHolder();
     }
 
-    final activitiesNotifier = ref.watch(activityListNotifierProvider.notifier);
+    final tabController = useTabController(initialLength: 3);
+    final currentFilter = useState<String?>(null);
 
-    return TourTriggerWidget(
-      child: AppScaffold(
-        appBar: AppBar(title: const Text('explore').tr()),
-        floatingActionButton: FloatingActionButton(
-          heroTag: Key("explore-page-fab"),
-          onPressed: () {
-            context.router.push(PostComposeRoute()).then((value) {
-              if (value != null) {
-                activitiesNotifier.forceRefresh();
-              }
-            });
-          },
-          child: const Icon(Symbols.edit),
-        ),
-        floatingActionButtonLocation: FloatingActionButtonLocation.endFloat,
-        body: RefreshIndicator(
-          onRefresh: () => Future.sync(activitiesNotifier.forceRefresh),
-          child: PagingHelperView(
-            provider: activityListNotifierProvider,
-            futureRefreshable: activityListNotifierProvider.future,
-            notifierRefreshable: activityListNotifierProvider.notifier,
-            contentBuilder:
-                (data, widgetCount, endItemView) => Center(
-                  child: _ActivityListView(
-                    data: data,
-                    widgetCount: widgetCount,
-                    endItemView: endItemView,
-                    activitiesNotifier: activitiesNotifier,
-                  ),
+    useEffect(() {
+      void listener() {
+        switch (tabController.index) {
+          case 0:
+            currentFilter.value = null;
+            break;
+          case 1:
+            currentFilter.value = 'subscriptions';
+            break;
+          case 2:
+            currentFilter.value = 'friends';
+            break;
+        }
+      }
+
+      tabController.addListener(listener);
+      return () => tabController.removeListener(listener);
+    }, [tabController]);
+
+    final activitiesNotifier = ref.watch(
+      activityListNotifierProvider(currentFilter.value).notifier,
+    );
+
+    return AppScaffold(
+      extendBody: false, // Prevent conflicts with tabs navigation
+      appBar: AppBar(
+        toolbarHeight: 0,
+        bottom: TabBar(
+          controller: tabController,
+          tabs: [
+            Tab(
+              child: Text(
+                'explore'.tr(),
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  color: Theme.of(context).appBarTheme.foregroundColor!,
                 ),
-          ),
+              ),
+            ),
+            Tab(
+              child: Text(
+                'exploreFilterSubscriptions'.tr(),
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  color: Theme.of(context).appBarTheme.foregroundColor!,
+                ),
+              ),
+            ),
+            Tab(
+              child: Text(
+                'exploreFilterFriends'.tr(),
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  color: Theme.of(context).appBarTheme.foregroundColor!,
+                ),
+              ),
+            ),
+          ],
         ),
       ),
+      floatingActionButton: FloatingActionButton(
+        heroTag: Key("explore-page-fab"),
+        onPressed: () {
+          context.push('/posts/compose').then((value) {
+            if (value != null) {
+              activitiesNotifier.forceRefresh();
+            }
+          });
+        },
+        child: const Icon(Symbols.edit),
+      ),
+      floatingActionButtonLocation: TabbedFabLocation(context),
+      body: TabBarView(
+        controller: tabController,
+        physics: const NeverScrollableScrollPhysics(),
+        children: [
+          _buildActivityList(ref, null),
+          _buildActivityList(ref, 'subscriptions'),
+          _buildActivityList(ref, 'friends'),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildActivityList(WidgetRef ref, String? filter) {
+    final activitiesNotifier = ref.watch(
+      activityListNotifierProvider(filter).notifier,
+    );
+
+    return RefreshIndicator(
+      onRefresh: () => Future.sync(activitiesNotifier.forceRefresh),
+      child: PagingHelperView(
+        provider: activityListNotifierProvider(filter),
+        futureRefreshable: activityListNotifierProvider(filter).future,
+        notifierRefreshable: activityListNotifierProvider(filter).notifier,
+        contentBuilder:
+            (data, widgetCount, endItemView) => Center(
+              child: _ActivityListView(
+                data: data,
+                widgetCount: widgetCount,
+                endItemView: endItemView,
+                activitiesNotifier: activitiesNotifier,
+                contentOnly: filter != null,
+              ),
+            ),
+      ),
+    );
+  }
+}
+
+class _DiscoveryActivityItem extends StatelessWidget {
+  final Map<String, dynamic> data;
+
+  const _DiscoveryActivityItem({required this.data});
+
+  @override
+  Widget build(BuildContext context) {
+    final items = data['items'] as List;
+    final type = items.firstOrNull?['type'] ?? 'unknown';
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Row(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            const Icon(Symbols.explore, size: 19),
+            const Gap(8),
+            Text(
+              (switch (type) {
+                'realm' => 'discoverRealms',
+                'publisher' => 'discoverPublishers',
+                _ => 'unknown',
+              }).tr(),
+              style: Theme.of(context).textTheme.titleMedium,
+            ).padding(top: 1),
+          ],
+        ).padding(horizontal: 20, top: 8, bottom: 4),
+        SizedBox(
+          height: 180,
+          child: ListView.builder(
+            scrollDirection: Axis.horizontal,
+            itemCount: items.length,
+            padding: const EdgeInsets.symmetric(horizontal: 8),
+            itemBuilder: (context, index) {
+              final item = items[index];
+              switch (type) {
+                case 'realm':
+                  return RealmCard(
+                    realm: SnRealm.fromJson(item['data']),
+                    maxWidth: 280,
+                  );
+                case 'publisher':
+                  return PublisherCard(
+                    publisher: SnPublisher.fromJson(item['data']),
+                    maxWidth: 280,
+                  );
+                default:
+                  return Placeholder();
+              }
+            },
+          ),
+        ).padding(bottom: 4),
+      ],
     );
   }
 }
@@ -100,6 +235,7 @@ class _ActivityListView extends HookConsumerWidget {
   final CursorPagingData<SnActivity> data;
   final int widgetCount;
   final Widget endItemView;
+  final bool contentOnly;
   final ActivityListNotifier activitiesNotifier;
 
   const _ActivityListView({
@@ -107,6 +243,7 @@ class _ActivityListView extends HookConsumerWidget {
     required this.widgetCount,
     required this.endItemView,
     required this.activitiesNotifier,
+    this.contentOnly = false,
   });
 
   @override
@@ -115,7 +252,8 @@ class _ActivityListView extends HookConsumerWidget {
 
     return CustomScrollView(
       slivers: [
-        if (user.hasValue) SliverToBoxAdapter(child: CheckInWidget()),
+        if (user.hasValue && !contentOnly)
+          SliverToBoxAdapter(child: CheckInWidget()),
         SliverList.builder(
           itemCount: widgetCount,
           itemBuilder: (context, index) {
@@ -136,10 +274,14 @@ class _ActivityListView extends HookConsumerWidget {
                 itemWidget = PostItem(
                   backgroundColor:
                       isWideScreen(context) ? Colors.transparent : null,
-                  item: SnPost.fromJson(item.data),
+                  item: SnPost.fromJson(item.data!),
                   padding:
                       isReply
-                          ? EdgeInsets.only(left: 16, right: 16, bottom: 16)
+                          ? const EdgeInsets.only(
+                            left: 16,
+                            right: 16,
+                            bottom: 16,
+                          )
                           : null,
                   onRefresh: (_) {
                     activitiesNotifier.forceRefresh();
@@ -167,6 +309,9 @@ class _ActivityListView extends HookConsumerWidget {
                   );
                 }
                 break;
+              case 'discovery':
+                itemWidget = _DiscoveryActivityItem(data: item.data!);
+                break;
               default:
                 itemWidget = const Placeholder();
             }
@@ -174,7 +319,7 @@ class _ActivityListView extends HookConsumerWidget {
             return Column(children: [itemWidget, const Divider(height: 1)]);
           },
         ),
-        SliverGap(MediaQuery.of(context).padding.bottom + 16),
+        SliverGap(getTabbedPadding(context).bottom),
       ],
     );
   }
@@ -184,16 +329,24 @@ class _ActivityListView extends HookConsumerWidget {
 class ActivityListNotifier extends _$ActivityListNotifier
     with CursorPagingNotifierMixin<SnActivity> {
   @override
-  Future<CursorPagingData<SnActivity>> build() => fetch(cursor: null);
+  Future<CursorPagingData<SnActivity>> build(String? filter) =>
+      fetch(cursor: null);
 
   @override
   Future<CursorPagingData<SnActivity>> fetch({required String? cursor}) async {
     final client = ref.read(apiClientProvider);
     final take = 20;
 
+    final queryParameters = {
+      if (cursor != null) 'cursor': cursor,
+      'take': take,
+      if (filter != null) 'filter': filter,
+      if (kDebugMode) 'debugInclude': 'realms,publishers',
+    };
+
     final response = await client.get(
       '/activities',
-      queryParameters: {if (cursor != null) 'cursor': cursor, 'take': take},
+      queryParameters: queryParameters,
     );
 
     final List<SnActivity> items =