mirror of
https://github.com/Ujwal223/FocusGram.git
synced 2026-05-16 21:13:26 +02:00
UPDATES: updated UI from sidebar to topbar(again)
fixed external redirect on instagram m's settings. fixed bug where it opened app session instead of reel session. hided vertical scroll bar. removed custom bottom bar. fixed bug where it wasnt showing searchbar in /explore. FIXED/ADDED/IMPROVED A LOT MORE THINGS. Ready for Release
This commit is contained in:
Ujwal
@@ -23,6 +23,9 @@ PRD.md
|
||||
# VS Code which you may wish to be included in version control, so this line
|
||||
# is commented out by default.
|
||||
#.vscode/
|
||||
RELEASE_GUIDE.md
|
||||
android/key.properties
|
||||
android/app/*.jks
|
||||
|
||||
# Flutter/Dart/Pub related
|
||||
**/doc/api/
|
||||
|
||||
@@ -0,0 +1,662 @@
|
||||
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, there is a terrible gap in the
|
||||
overall display. 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 modified source code 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 GNU Affero General Public License and
|
||||
published by Affero, Inc., was designed to accomplish similar goals.
|
||||
This is a different license, not a version of the Affero GPL, but
|
||||
Affero, Inc. has permitted us to publish this program under the Affero
|
||||
GPL.
|
||||
|
||||
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 Component, but which is not part of that Component, and
|
||||
(b) serves only to enable use of the work with that Component, or to
|
||||
implement a Standard Interface for which an implementation is
|
||||
available to the public in source code form. A "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 the
|
||||
Corresponding Source is located. 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
|
||||
to be 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.
|
||||
|
||||
You may convey a covered work under this License, and concurrently
|
||||
combine it with a work licensed under version 3 of the GNU General
|
||||
Public License into a single combined work, and 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 offers the most absolute
|
||||
waiver of 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.
|
||||
|
||||
FocusGram - Distraction-free Instagram client
|
||||
Copyright (C) 2025 Ujwal Chapagain
|
||||
|
||||
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 a notice 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/>.
|
||||
@@ -1,16 +1,83 @@
|
||||
# focusgram
|
||||
# FocusGram
|
||||
|
||||
A new Flutter project.
|
||||
[](LICENSE)
|
||||
[](https://flutter.dev)
|
||||
[](https://github.com/Ujwal223/FocusGram/releases)
|
||||
|
||||
## Getting Started
|
||||
**Take back your time.** FocusGram is a distraction-free client for Instagram on Android that hides Reels and Explore, so you can stay connected without getting lost in the scroll.
|
||||
|
||||
This project is a starting point for a Flutter application.
|
||||
[🌟 Star on GitHub](https://github.com/Ujwal223/FocusGram) | [📥 Download Latest APK](https://github.com/Ujwal223/FocusGram/releases)
|
||||
|
||||
A few resources to get you started if this is your first Flutter project:
|
||||
---
|
||||
|
||||
- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
|
||||
- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
|
||||
## Why FocusGram?
|
||||
|
||||
For help getting started with Flutter development, view the
|
||||
[online documentation](https://docs.flutter.dev/), which offers tutorials,
|
||||
samples, guidance on mobile development, and a full API reference.
|
||||
Most people don't want to delete Instagram entirely—they just want to stop wasting hours on Reels. FocusGram surgically removes the parts of Instagram designed for compulsive scrolling, while keeping your feed, stories, and DMs fully functional.
|
||||
|
||||
### Key Benefits
|
||||
- **Mental Health**: Stop the dopamine loop of endless autoplay videos.
|
||||
- **Productivity**: Open Instagram to check a message or post a story, and get out in seconds.
|
||||
- **Privacy**: No tracking, no analytics, and no third-party SDKs. Your data stays on your device.
|
||||
|
||||
---
|
||||
|
||||
## Master Your Usage
|
||||
|
||||
FocusGram doesn't just block Reels—it gives you tools to build better habits:
|
||||
|
||||
- ✅ **Controlled Reel Sessions**: Need to watch a Reel? Start a timed session (1 to 15 minutes). When the time is up, they're blocked again.
|
||||
- ✅ **Daily Limits**: Set a maximum amount of Reel time per day.
|
||||
- ✅ **Habit-Building Cooldowns**: Enforce a mandatory break between sessions to prevent bingeing.
|
||||
|
||||
---
|
||||
|
||||
## Installation
|
||||
|
||||
### 1. From GitHub (Current)
|
||||
1. Go to the [Releases](https://github.com/Ujwal223/FocusGram/releases) page.
|
||||
2. Download the `focusgram-release.apk`.
|
||||
3. Open the file on your phone and allow "Install from unknown sources" if prompted.
|
||||
|
||||
### 2. From F-Droid (Soon)
|
||||
We are currently in the process of submitting FocusGram to the F-Droid store for easier updates.
|
||||
|
||||
---
|
||||
|
||||
## Frequently Asked Questions
|
||||
|
||||
**Is my login safe?**
|
||||
Yes. FocusGram uses a standard system WebView. Your credentials go directly to Instagram/Meta's servers, just like in a mobile browser. We do not (and cannot) see your password.
|
||||
|
||||
**Why is it free?**
|
||||
FocusGram is Open Source software created by [Ujwal Chapagain](https://github.com/Ujwal223). It is built for everyone who wants a healthier relationship with social media.
|
||||
|
||||
---
|
||||
|
||||
## Development & Technical Details
|
||||
|
||||
<details>
|
||||
<summary>View Technical Info</summary>
|
||||
|
||||
### Build from Source
|
||||
```bash
|
||||
flutter pub get
|
||||
flutter build apk --release
|
||||
```
|
||||
|
||||
### Permissions
|
||||
- `INTERNET`: To load Instagram.
|
||||
- `RECEIVE_BOOT_COMPLETED`: To keep your session timers and notifications accurate after a restart.
|
||||
|
||||
### Tech Stack
|
||||
- **Framework**: Flutter (Dart)
|
||||
- **Engine**: webview_flutter
|
||||
- **License**: AGPL-3.0 (Affero General Public License)
|
||||
</details>
|
||||
|
||||
---
|
||||
|
||||
## License
|
||||
|
||||
Copyright (C) 2025 Ujwal Chapagain
|
||||
|
||||
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.
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import java.util.Properties
|
||||
|
||||
plugins {
|
||||
id("com.android.application")
|
||||
id("kotlin-android")
|
||||
@@ -6,10 +8,26 @@ plugins {
|
||||
}
|
||||
|
||||
android {
|
||||
namespace = "com.focusgram.focusgram"
|
||||
namespace = "com.ujwal.focusgram"
|
||||
compileSdk = flutter.compileSdkVersion
|
||||
buildToolsVersion = "34.0.0"
|
||||
ndkVersion = flutter.ndkVersion
|
||||
|
||||
val keystorePropertiesFile = rootProject.file("key.properties")
|
||||
val keystoreProperties = Properties()
|
||||
if (keystorePropertiesFile.exists()) {
|
||||
keystoreProperties.load(keystorePropertiesFile.inputStream())
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
create("release") {
|
||||
keyAlias = keystoreProperties["keyAlias"] as String?
|
||||
keyPassword = keystoreProperties["keyPassword"] as String?
|
||||
storeFile = keystoreProperties["storeFile"]?.let { file(it) }
|
||||
storePassword = keystoreProperties["storePassword"] as String?
|
||||
}
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
@@ -17,12 +35,11 @@ android {
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = JavaVersion.VERSION_17.toString()
|
||||
jvmTarget = "17"
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
|
||||
applicationId = "com.focusgram.focusgram"
|
||||
applicationId = "com.ujwal.focusgram"
|
||||
// You can update the following values to match your application needs.
|
||||
// For more information, see: https://flutter.dev/to/review-gradle-config.
|
||||
minSdk = flutter.minSdkVersion
|
||||
@@ -33,9 +50,16 @@ android {
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
// TODO: Add your own signing config for the release build.
|
||||
// Signing with the debug keys for now, so `flutter run --release` works.
|
||||
signingConfig = signingConfigs.getByName("debug")
|
||||
if (keystorePropertiesFile.exists()) {
|
||||
signingConfig = signingConfigs.getByName("release")
|
||||
} else {
|
||||
signingConfig = signingConfigs.getByName("debug")
|
||||
}
|
||||
|
||||
// Fix for release crash: Apply proguard rules
|
||||
isMinifyEnabled = true
|
||||
isShrinkResources = true
|
||||
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Vendored
+28
@@ -0,0 +1,28 @@
|
||||
# Flutter Wrapper
|
||||
-keep class io.flutter.app.** { *; }
|
||||
-keep class io.flutter.plugin.** { *; }
|
||||
-keep class io.flutter.util.** { *; }
|
||||
-keep class io.flutter.view.** { *; }
|
||||
-keep class io.flutter.** { *; }
|
||||
-keep class io.flutter.plugins.** { *; }
|
||||
|
||||
# flutter_local_notifications
|
||||
-keep class com.dexterous.flutterlocalnotifications.** { *; }
|
||||
-keep class com.google.firebase.messaging.** { *; }
|
||||
-dontwarn com.google.firebase.messaging.**
|
||||
|
||||
# webview_flutter
|
||||
-keep class io.flutter.plugins.webviewflutter.** { *; }
|
||||
|
||||
# Keystore and common
|
||||
-keep class com.ujwal.focusgram.** { *; }
|
||||
|
||||
# Flutter Play Store Split (ignore optional references)
|
||||
-dontwarn com.google.android.play.core.**
|
||||
-dontwarn com.google.android.gms.common.**
|
||||
|
||||
# Avoid stripping JS bridge names
|
||||
-keepattributes JavascriptInterface
|
||||
-keepclassmembers class * {
|
||||
@android.webkit.JavascriptInterface <methods>;
|
||||
}
|
||||
@@ -9,6 +9,7 @@
|
||||
android:usesCleartextTraffic="false"
|
||||
android:networkSecurityConfig="@xml/network_security_config">
|
||||
|
||||
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:exported="true"
|
||||
@@ -26,6 +27,26 @@
|
||||
<action android:name="android.intent.action.MAIN"/>
|
||||
<category android:name="android.intent.category.LAUNCHER"/>
|
||||
</intent-filter>
|
||||
|
||||
<!-- Instagram, Threads, and related domains deep linking -->
|
||||
<intent-filter android:autoVerify="true">
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
|
||||
<!-- https://instagram.com and subdomains -->
|
||||
<data android:scheme="http" />
|
||||
<data android:scheme="https" />
|
||||
<data android:host="instagram.com" />
|
||||
<data android:host="www.instagram.com" />
|
||||
<data android:host="l.instagram.com" />
|
||||
<data android:host="help.instagram.com" />
|
||||
<data android:host="about.instagram.com" />
|
||||
|
||||
<!-- Short URLs -->
|
||||
<data android:host="instagr.am" />
|
||||
<data android:host="www.instagr.am" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
<!-- Flutter tool meta-data -->
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.focusgram.focusgram
|
||||
package com.ujwal.focusgram
|
||||
|
||||
import io.flutter.embedding.android.FlutterActivity
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 6.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 20 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 40 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 75 KiB After Width: | Height: | Size: 65 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 3.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 5.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 17 KiB |
@@ -5,3 +5,4 @@
|
||||
-->
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
</manifest>
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,2 +1,2 @@
|
||||
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
|
||||
org.gradle.jvmargs=-Xmx3G -XX:MaxMetaspaceSize=1G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
|
||||
android.useAndroidX=true
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 25 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 114 KiB After Width: | Height: | Size: 97 KiB |
@@ -0,0 +1,5 @@
|
||||
Initial open-source release of FocusGram.
|
||||
- Complete Reels and Explore hiding.
|
||||
- Timed Reel sessions and daily limits.
|
||||
- Isolated DM Reel player.
|
||||
- Privacy-first: No Firebase or trackers.
|
||||
@@ -0,0 +1,9 @@
|
||||
FocusGram is a distraction-free client for Instagram that allows you to use the core features—feed, stories, DMs, and profile—without getting stuck in the endless scroll of Reels and Explore.
|
||||
|
||||
Key Features:
|
||||
- Adds blur in explore feeds and homepage posts.
|
||||
- Blocks navigation to /reel/ URLs to prevent accidental distraction.
|
||||
- Implement controlled Reel sessions with customizable time limits and daily totals.
|
||||
- Enforces cooldown periods between sessions to build better habits.
|
||||
- Privacy-focused: No ads, no tracking, and no proprietary SDKs.
|
||||
- 100% Free and Open Source.
|
||||
@@ -0,0 +1 @@
|
||||
Distraction-free Instagram with controlled Reel access.
|
||||
@@ -0,0 +1 @@
|
||||
FocusGram
|
||||
+38
-6
@@ -1,13 +1,16 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:app_links/app_links.dart';
|
||||
import 'services/session_manager.dart';
|
||||
import 'services/settings_service.dart';
|
||||
import 'services/focusgram_router.dart';
|
||||
import 'screens/onboarding_page.dart';
|
||||
import 'screens/main_webview_page.dart';
|
||||
import 'screens/breath_gate_screen.dart';
|
||||
import 'screens/app_session_picker.dart';
|
||||
import 'screens/cooldown_gate_screen.dart';
|
||||
import 'services/notification_service.dart';
|
||||
|
||||
void main() async {
|
||||
WidgetsFlutterBinding.ensureInitialized();
|
||||
@@ -23,6 +26,7 @@ void main() async {
|
||||
|
||||
await sessionManager.init();
|
||||
await settingsService.init();
|
||||
await NotificationService().init();
|
||||
|
||||
runApp(
|
||||
MultiProvider(
|
||||
@@ -40,16 +44,21 @@ class FocusGramApp extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final settings = context.watch<SettingsService>();
|
||||
final isDark = settings.isDarkMode;
|
||||
|
||||
return MaterialApp(
|
||||
title: 'FocusGram',
|
||||
debugShowCheckedModeBanner: false,
|
||||
theme: ThemeData(
|
||||
brightness: Brightness.dark,
|
||||
colorScheme: ColorScheme.dark(
|
||||
primary: Colors.blue.shade400,
|
||||
surface: Colors.black,
|
||||
),
|
||||
scaffoldBackgroundColor: Colors.black,
|
||||
brightness: isDark ? Brightness.dark : Brightness.light,
|
||||
colorScheme: isDark
|
||||
? ColorScheme.dark(
|
||||
primary: Colors.blue.shade400,
|
||||
surface: Colors.black,
|
||||
)
|
||||
: ColorScheme.light(primary: Colors.blue),
|
||||
scaffoldBackgroundColor: isDark ? Colors.black : Colors.white,
|
||||
useMaterial3: true,
|
||||
splashColor: Colors.transparent,
|
||||
highlightColor: Colors.transparent,
|
||||
@@ -76,6 +85,29 @@ class _InitialRouteHandlerState extends State<InitialRouteHandler> {
|
||||
bool _breathCompleted = false;
|
||||
bool _appSessionStarted = false;
|
||||
bool _onboardingCompleted = false;
|
||||
late AppLinks _appLinks;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_appLinks = AppLinks();
|
||||
_initDeepLinks();
|
||||
}
|
||||
|
||||
Future<void> _initDeepLinks() async {
|
||||
// 1. Handle background links while app is running
|
||||
_appLinks.uriLinkStream.listen((uri) {
|
||||
debugPrint('Incoming Deep Link: $uri');
|
||||
FocusGramRouter.pendingUrl.value = uri.toString();
|
||||
});
|
||||
|
||||
// 2. Handle the initial link that opened the app
|
||||
final initialUri = await _appLinks.getInitialLink();
|
||||
if (initialUri != null) {
|
||||
debugPrint('Initial Deep Link: $initialUri');
|
||||
FocusGramRouter.pendingUrl.value = initialUri.toString();
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
|
||||
@@ -11,7 +11,7 @@ class AboutPage extends StatefulWidget {
|
||||
}
|
||||
|
||||
class _AboutPageState extends State<AboutPage> {
|
||||
final String _currentVersion = '0.8.5';
|
||||
final String _currentVersion = '0.9.8';
|
||||
bool _isChecking = false;
|
||||
|
||||
Future<void> _checkUpdate() async {
|
||||
@@ -110,10 +110,13 @@ class _AboutPageState extends State<AboutPage> {
|
||||
color: Colors.blue.withValues(alpha: 0.1),
|
||||
shape: BoxShape.circle,
|
||||
),
|
||||
child: const Icon(
|
||||
Icons.psychology,
|
||||
color: Colors.blue,
|
||||
size: 50,
|
||||
child: ClipOval(
|
||||
child: Image.asset(
|
||||
'assets/images/focusgram.png',
|
||||
width: 60,
|
||||
height: 60,
|
||||
fit: BoxFit.cover,
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
|
||||
@@ -1,19 +1,93 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import '../services/session_manager.dart';
|
||||
import '../services/settings_service.dart';
|
||||
import '../utils/discipline_challenge.dart';
|
||||
|
||||
class GuardrailsPage extends StatelessWidget {
|
||||
class GuardrailsPage extends StatefulWidget {
|
||||
const GuardrailsPage({super.key});
|
||||
|
||||
@override
|
||||
State<GuardrailsPage> createState() => _GuardrailsPageState();
|
||||
}
|
||||
|
||||
class _GuardrailsPageState extends State<GuardrailsPage> {
|
||||
Future<void> _handleScheduleAction(
|
||||
BuildContext context,
|
||||
SessionManager sm,
|
||||
Future<void> Function() action,
|
||||
) async {
|
||||
if (sm.isScheduledBlockActive) {
|
||||
final ok = await DisciplineChallenge.show(context, count: 35);
|
||||
if (!context.mounted || !ok) return;
|
||||
}
|
||||
await action();
|
||||
}
|
||||
|
||||
Future<void> _pickNewSchedule(BuildContext context, SessionManager sm) async {
|
||||
final start = await showTimePicker(
|
||||
context: context,
|
||||
initialTime: const TimeOfDay(hour: 22, minute: 0),
|
||||
helpText: 'Select Start Time',
|
||||
);
|
||||
if (!context.mounted || start == null) return;
|
||||
|
||||
final end = await showTimePicker(
|
||||
context: context,
|
||||
initialTime: const TimeOfDay(hour: 7, minute: 0),
|
||||
helpText: 'Select End Time',
|
||||
);
|
||||
if (!context.mounted || end == null) return;
|
||||
|
||||
await sm.addSchedule(
|
||||
FocusSchedule(
|
||||
startHour: start.hour,
|
||||
startMinute: start.minute,
|
||||
endHour: end.hour,
|
||||
endMinute: end.minute,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _editExistingSchedule(
|
||||
BuildContext context,
|
||||
SessionManager sm,
|
||||
int index,
|
||||
FocusSchedule s,
|
||||
) async {
|
||||
final start = await showTimePicker(
|
||||
context: context,
|
||||
initialTime: TimeOfDay(hour: s.startHour, minute: s.startMinute),
|
||||
helpText: 'Edit Start Time',
|
||||
);
|
||||
if (!context.mounted || start == null) return;
|
||||
|
||||
final end = await showTimePicker(
|
||||
context: context,
|
||||
initialTime: TimeOfDay(hour: s.endHour, minute: s.endMinute),
|
||||
helpText: 'Edit End Time',
|
||||
);
|
||||
if (!context.mounted || end == null) return;
|
||||
|
||||
await sm.updateScheduleAt(
|
||||
index,
|
||||
FocusSchedule(
|
||||
startHour: start.hour,
|
||||
startMinute: start.minute,
|
||||
endHour: end.hour,
|
||||
endMinute: end.minute,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final sm = context.watch<SessionManager>();
|
||||
final settings = context.watch<SettingsService>();
|
||||
final isDark = settings.isDarkMode;
|
||||
|
||||
return Scaffold(
|
||||
backgroundColor: Colors.black,
|
||||
appBar: AppBar(
|
||||
backgroundColor: Colors.black,
|
||||
title: const Text(
|
||||
'Guardrails',
|
||||
style: TextStyle(fontSize: 17, fontWeight: FontWeight.bold),
|
||||
@@ -25,11 +99,14 @@ class GuardrailsPage extends StatelessWidget {
|
||||
),
|
||||
body: ListView(
|
||||
children: [
|
||||
const Padding(
|
||||
padding: EdgeInsets.all(16.0),
|
||||
Padding(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
child: Text(
|
||||
'Set your limits to stay focused. Changes to these settings require a challenge.',
|
||||
style: TextStyle(color: Colors.white54, fontSize: 13),
|
||||
style: TextStyle(
|
||||
color: isDark ? Colors.white54 : Colors.black54,
|
||||
fontSize: 13,
|
||||
),
|
||||
),
|
||||
),
|
||||
_buildFrictionSliderTile(
|
||||
@@ -60,84 +137,83 @@ class GuardrailsPage extends StatelessWidget {
|
||||
'Reducing cooldown makes it easier to start new sessions. Are you sure?',
|
||||
onConfirmed: (v) => sm.setCooldownMinutes(v.toInt()),
|
||||
),
|
||||
const Divider(color: Colors.white10, height: 32),
|
||||
const Padding(
|
||||
padding: EdgeInsets.symmetric(horizontal: 16.0),
|
||||
child: Text(
|
||||
'Scheduled Blocking',
|
||||
Divider(color: isDark ? Colors.white10 : Colors.black12, height: 32),
|
||||
SwitchListTile(
|
||||
title: const Text('Scheduled Blocking'),
|
||||
subtitle: Text(
|
||||
'Block Instagram during specific hours',
|
||||
style: TextStyle(
|
||||
color: Colors.blue,
|
||||
fontWeight: FontWeight.bold,
|
||||
color: isDark ? Colors.white54 : Colors.black54,
|
||||
fontSize: 13,
|
||||
),
|
||||
),
|
||||
),
|
||||
SwitchListTile(
|
||||
title: const Text(
|
||||
'Enable Blocking Schedule',
|
||||
style: TextStyle(color: Colors.white),
|
||||
),
|
||||
subtitle: const Text(
|
||||
'Block Instagram during specific hours',
|
||||
style: TextStyle(color: Colors.white54, fontSize: 13),
|
||||
),
|
||||
value: sm.scheduleEnabled,
|
||||
onChanged: (v) => sm.setScheduleEnabled(v),
|
||||
),
|
||||
if (sm.scheduleEnabled) ...[
|
||||
ListTile(
|
||||
title: const Text(
|
||||
'Start Time',
|
||||
style: TextStyle(color: Colors.white),
|
||||
),
|
||||
trailing: Text(
|
||||
'${sm.schedStartHour.toString().padLeft(2, '0')}:${sm.schedStartMin.toString().padLeft(2, '0')}',
|
||||
style: const TextStyle(color: Colors.blue),
|
||||
),
|
||||
onTap: () async {
|
||||
final time = await showTimePicker(
|
||||
context: context,
|
||||
initialTime: TimeOfDay(
|
||||
hour: sm.schedStartHour,
|
||||
minute: sm.schedStartMin,
|
||||
...sm.schedules.asMap().entries.map((entry) {
|
||||
final idx = entry.key;
|
||||
final s = entry.value;
|
||||
return ListTile(
|
||||
title: Text(
|
||||
'Schedule ${idx + 1}',
|
||||
style: const TextStyle(fontSize: 14),
|
||||
),
|
||||
subtitle: Text(
|
||||
'${sm.formatTime12h(s.startHour, s.startMinute)} - ${sm.formatTime12h(s.endHour, s.endMinute)}',
|
||||
style: TextStyle(
|
||||
color: isDark ? Colors.white54 : Colors.black54,
|
||||
fontSize: 13,
|
||||
),
|
||||
);
|
||||
if (time != null) {
|
||||
sm.setScheduleTime(
|
||||
startH: time.hour,
|
||||
startM: time.minute,
|
||||
endH: sm.schedEndHour,
|
||||
endM: sm.schedEndMin,
|
||||
);
|
||||
}
|
||||
},
|
||||
),
|
||||
),
|
||||
trailing: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
IconButton(
|
||||
icon: const Icon(
|
||||
Icons.edit,
|
||||
color: Colors.blue,
|
||||
size: 20,
|
||||
),
|
||||
onPressed: () => _handleScheduleAction(
|
||||
context,
|
||||
sm,
|
||||
() => _editExistingSchedule(context, sm, idx, s),
|
||||
),
|
||||
),
|
||||
IconButton(
|
||||
icon: const Icon(
|
||||
Icons.delete_outline,
|
||||
color: Colors.redAccent,
|
||||
size: 20,
|
||||
),
|
||||
onPressed: () => _handleScheduleAction(
|
||||
context,
|
||||
sm,
|
||||
() => sm.removeScheduleAt(idx),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}),
|
||||
ListTile(
|
||||
leading: const Icon(
|
||||
Icons.add_circle_outline,
|
||||
color: Colors.blueAccent,
|
||||
),
|
||||
title: const Text(
|
||||
'End Time',
|
||||
style: TextStyle(color: Colors.white),
|
||||
'Add Focus Hours',
|
||||
style: TextStyle(
|
||||
color: Colors.blueAccent,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
trailing: Text(
|
||||
'${sm.schedEndHour.toString().padLeft(2, '0')}:${sm.schedEndMin.toString().padLeft(2, '0')}',
|
||||
style: const TextStyle(color: Colors.blue),
|
||||
onTap: () => _handleScheduleAction(
|
||||
context,
|
||||
sm,
|
||||
() => _pickNewSchedule(context, sm),
|
||||
),
|
||||
onTap: () async {
|
||||
final time = await showTimePicker(
|
||||
context: context,
|
||||
initialTime: TimeOfDay(
|
||||
hour: sm.schedEndHour,
|
||||
minute: sm.schedEndMin,
|
||||
),
|
||||
);
|
||||
if (time != null) {
|
||||
sm.setScheduleTime(
|
||||
startH: sm.schedStartHour,
|
||||
startM: sm.schedStartMin,
|
||||
endH: time.hour,
|
||||
endM: time.minute,
|
||||
);
|
||||
}
|
||||
},
|
||||
),
|
||||
],
|
||||
],
|
||||
@@ -217,18 +293,17 @@ class _FrictionSliderTileState extends State<_FrictionSliderTile> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final settings = context.watch<SettingsService>();
|
||||
final isDark = settings.isDarkMode;
|
||||
final divisions = ((widget.max - widget.min) / widget.divisor).round();
|
||||
|
||||
return Column(
|
||||
children: [
|
||||
ListTile(
|
||||
title: Text(
|
||||
widget.title,
|
||||
style: const TextStyle(color: Colors.white),
|
||||
),
|
||||
title: Text(widget.title),
|
||||
subtitle: Text(
|
||||
'${_draftValue.toInt()} min',
|
||||
style: const TextStyle(color: Colors.white70),
|
||||
style: TextStyle(color: isDark ? Colors.white70 : Colors.black54),
|
||||
),
|
||||
trailing: _pendingConfirm
|
||||
? Row(
|
||||
@@ -241,15 +316,22 @@ class _FrictionSliderTileState extends State<_FrictionSliderTile> {
|
||||
_pendingConfirm = false;
|
||||
});
|
||||
},
|
||||
child: const Text(
|
||||
'Cancel',
|
||||
style: TextStyle(color: Colors.white38),
|
||||
),
|
||||
child: const Text('Cancel'),
|
||||
),
|
||||
ElevatedButton(
|
||||
onPressed: () async {
|
||||
final success = await DisciplineChallenge.show(context);
|
||||
if (!success) return;
|
||||
final sm = context.read<SessionManager>();
|
||||
int wordCount = 15;
|
||||
// If we are at 0 quota, increase difficulty to 35 words
|
||||
if (widget.title.contains('Daily Reel Limit') &&
|
||||
sm.dailyRemainingSeconds <= 0) {
|
||||
wordCount = 35;
|
||||
}
|
||||
final success = await DisciplineChallenge.show(
|
||||
context,
|
||||
count: wordCount,
|
||||
);
|
||||
if (!context.mounted || !success) return;
|
||||
await widget.onConfirmed(_draftValue);
|
||||
setState(() => _pendingConfirm = false);
|
||||
},
|
||||
|
||||
+725
-559
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:permission_handler/permission_handler.dart';
|
||||
import 'package:app_settings/app_settings.dart';
|
||||
import '../services/settings_service.dart';
|
||||
import '../services/notification_service.dart';
|
||||
|
||||
@@ -39,6 +40,14 @@ class _OnboardingPageState extends State<OnboardingPage> {
|
||||
icon: Icons.timer,
|
||||
color: Colors.orange,
|
||||
),
|
||||
OnboardingData(
|
||||
title: 'Open Links in FocusGram',
|
||||
description:
|
||||
'To open Instagram links directly here: Tap "Configure", then "Open by default" -> "Add link" and select all.',
|
||||
icon: Icons.link,
|
||||
color: Colors.cyan,
|
||||
isAppSettingsPage: true,
|
||||
),
|
||||
OnboardingData(
|
||||
title: 'Upload Content',
|
||||
description:
|
||||
@@ -101,48 +110,53 @@ class _OnboardingPageState extends State<OnboardingPage> {
|
||||
child: SizedBox(
|
||||
width: double.infinity,
|
||||
height: 56,
|
||||
child: ElevatedButton(
|
||||
onPressed: () async {
|
||||
if (_pages[_currentPage].isPermissionPage) {
|
||||
if (_pages[_currentPage].permission != null) {
|
||||
await _pages[_currentPage].permission!.request();
|
||||
}
|
||||
if (_pages[_currentPage].title == 'Stay Notified') {
|
||||
await NotificationService().init();
|
||||
}
|
||||
if (_currentPage == _pages.length - 1) {
|
||||
_finish();
|
||||
} else {
|
||||
_pageController.nextPage(
|
||||
duration: const Duration(milliseconds: 300),
|
||||
curve: Curves.easeInOut,
|
||||
);
|
||||
}
|
||||
} else if (_currentPage < _pages.length - 1) {
|
||||
_pageController.nextPage(
|
||||
duration: const Duration(milliseconds: 300),
|
||||
curve: Curves.easeInOut,
|
||||
);
|
||||
} else {
|
||||
_finish();
|
||||
}
|
||||
child: Builder(
|
||||
builder: (context) {
|
||||
final data = _pages[_currentPage];
|
||||
return ElevatedButton(
|
||||
onPressed: () async {
|
||||
if (data.isAppSettingsPage) {
|
||||
await AppSettings.openAppSettings(
|
||||
type: AppSettingsType.settings,
|
||||
);
|
||||
} else if (data.isPermissionPage) {
|
||||
if (data.permission != null) {
|
||||
await data.permission!.request();
|
||||
}
|
||||
if (data.title == 'Stay Notified') {
|
||||
await NotificationService().init();
|
||||
}
|
||||
}
|
||||
|
||||
if (_currentPage == _pages.length - 1) {
|
||||
_finish();
|
||||
} else {
|
||||
_pageController.nextPage(
|
||||
duration: const Duration(milliseconds: 300),
|
||||
curve: Curves.easeInOut,
|
||||
);
|
||||
}
|
||||
},
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: Colors.blue,
|
||||
foregroundColor: Colors.white,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
),
|
||||
),
|
||||
child: Text(
|
||||
_currentPage == _pages.length - 1
|
||||
? 'Get Started'
|
||||
: (data.isAppSettingsPage
|
||||
? 'Configure'
|
||||
: 'Next'),
|
||||
style: const TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: Colors.blue,
|
||||
foregroundColor: Colors.white,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
),
|
||||
),
|
||||
child: Text(
|
||||
_currentPage == _pages.length - 1
|
||||
? 'Get Started'
|
||||
: 'Next',
|
||||
style: const TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -166,6 +180,7 @@ class OnboardingData {
|
||||
final IconData icon;
|
||||
final Color color;
|
||||
final bool isPermissionPage;
|
||||
final bool isAppSettingsPage;
|
||||
final Permission? permission;
|
||||
|
||||
OnboardingData({
|
||||
@@ -174,6 +189,7 @@ class OnboardingData {
|
||||
required this.icon,
|
||||
required this.color,
|
||||
this.isPermissionPage = false,
|
||||
this.isAppSettingsPage = false,
|
||||
this.permission,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -32,6 +32,10 @@ class _ReelPlayerOverlayState extends State<ReelPlayerOverlay> {
|
||||
..setNavigationDelegate(
|
||||
NavigationDelegate(
|
||||
onPageFinished: (url) {
|
||||
// Set isolated player flag to ensure scroll-lock applies even if a session is active globally
|
||||
_controller.runJavaScript(
|
||||
'window.__focusgramIsolatedPlayer = true;',
|
||||
);
|
||||
// Apply scroll-lock via MutationObserver: prevents swiping to next reel
|
||||
_controller.runJavaScript(
|
||||
InjectionController.reelsMutationObserverJS,
|
||||
@@ -42,7 +46,10 @@ class _ReelPlayerOverlayState extends State<ReelPlayerOverlay> {
|
||||
sessionActive: true,
|
||||
blurExplore: false,
|
||||
blurReels: false,
|
||||
ghostMode: false,
|
||||
ghostTyping: false,
|
||||
ghostSeen: false,
|
||||
ghostStories: false,
|
||||
ghostDmPhotos: false,
|
||||
enableTextSelection: true,
|
||||
),
|
||||
);
|
||||
|
||||
+314
-131
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import '../services/session_manager.dart';
|
||||
import '../services/settings_service.dart';
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
import '../services/focusgram_router.dart';
|
||||
import 'guardrails_page.dart';
|
||||
import 'about_page.dart';
|
||||
|
||||
@@ -13,11 +13,11 @@ class SettingsPage extends StatelessWidget {
|
||||
Widget build(BuildContext context) {
|
||||
// Watching services ensures the UI rebuilds when settings or session state change.
|
||||
final sm = context.watch<SessionManager>();
|
||||
final settings = context.watch<SettingsService>();
|
||||
final isDark = settings.isDarkMode;
|
||||
|
||||
return Scaffold(
|
||||
backgroundColor: Colors.black,
|
||||
appBar: AppBar(
|
||||
backgroundColor: Colors.black,
|
||||
title: const Text(
|
||||
'FocusGram',
|
||||
style: TextStyle(fontSize: 17, fontWeight: FontWeight.w600),
|
||||
@@ -55,6 +55,13 @@ class SettingsPage extends StatelessWidget {
|
||||
icon: Icons.extension_outlined,
|
||||
destination: const _ExtrasSettingsPage(),
|
||||
),
|
||||
_buildSettingsTile(
|
||||
context: context,
|
||||
title: 'Notifications',
|
||||
subtitle: 'Manage message and activity alerts',
|
||||
icon: Icons.notifications_active_outlined,
|
||||
destination: const _NotificationSettingsPage(),
|
||||
),
|
||||
_buildSettingsTile(
|
||||
context: context,
|
||||
title: 'About',
|
||||
@@ -63,44 +70,39 @@ class SettingsPage extends StatelessWidget {
|
||||
destination: const AboutPage(),
|
||||
),
|
||||
|
||||
const Divider(
|
||||
color: Colors.white10,
|
||||
height: 40,
|
||||
indent: 16,
|
||||
endIndent: 16,
|
||||
),
|
||||
const Divider(height: 40, indent: 16, endIndent: 16),
|
||||
|
||||
ListTile(
|
||||
leading: const Icon(
|
||||
Icons.settings_outlined,
|
||||
color: Colors.purpleAccent,
|
||||
),
|
||||
title: const Text(
|
||||
'Instagram Settings',
|
||||
style: TextStyle(color: Colors.white),
|
||||
),
|
||||
title: const Text('Instagram Settings'),
|
||||
subtitle: const Text(
|
||||
'Open native Instagram account settings',
|
||||
style: TextStyle(color: Colors.white54, fontSize: 12),
|
||||
style: TextStyle(fontSize: 12),
|
||||
),
|
||||
trailing: const Icon(
|
||||
Icons.open_in_new,
|
||||
color: Colors.white24,
|
||||
size: 14,
|
||||
),
|
||||
onTap: () async {
|
||||
final uri = Uri.parse(
|
||||
'https://www.instagram.com/accounts/settings/?entrypoint=profile',
|
||||
);
|
||||
await launchUrl(uri, mode: LaunchMode.externalApplication);
|
||||
onTap: () {
|
||||
// Bug 6 fix: navigate inside the WebView instead of external browser
|
||||
Navigator.pop(context);
|
||||
FocusGramRouter.pendingUrl.value =
|
||||
'https://www.instagram.com/accounts/settings/?entrypoint=profile';
|
||||
},
|
||||
),
|
||||
|
||||
const SizedBox(height: 40),
|
||||
const Center(
|
||||
Center(
|
||||
child: Text(
|
||||
'FocusGram · Built for discipline',
|
||||
style: TextStyle(color: Colors.white12, fontSize: 12),
|
||||
style: TextStyle(
|
||||
color: isDark ? Colors.white12 : Colors.black12,
|
||||
fontSize: 12,
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
@@ -118,16 +120,9 @@ class SettingsPage extends StatelessWidget {
|
||||
}) {
|
||||
return ListTile(
|
||||
leading: Icon(icon, color: Colors.blue),
|
||||
title: Text(title, style: const TextStyle(color: Colors.white)),
|
||||
subtitle: Text(
|
||||
subtitle,
|
||||
style: const TextStyle(color: Colors.white54, fontSize: 13),
|
||||
),
|
||||
trailing: const Icon(
|
||||
Icons.arrow_forward_ios,
|
||||
color: Colors.white24,
|
||||
size: 14,
|
||||
),
|
||||
title: Text(title),
|
||||
subtitle: Text(subtitle, style: const TextStyle(fontSize: 13)),
|
||||
trailing: const Icon(Icons.arrow_forward_ios, size: 14),
|
||||
onTap: () => Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(builder: (_) => destination),
|
||||
@@ -140,9 +135,9 @@ class SettingsPage extends StatelessWidget {
|
||||
margin: const EdgeInsets.fromLTRB(16, 20, 16, 4),
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xFF111111),
|
||||
color: Colors.blue.withValues(alpha: 0.05),
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
border: Border.all(color: Colors.white10),
|
||||
border: Border.all(color: Colors.blue.withValues(alpha: 0.1)),
|
||||
),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceAround,
|
||||
@@ -177,16 +172,16 @@ class SettingsPage extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
Text(
|
||||
label,
|
||||
style: const TextStyle(color: Colors.white38, fontSize: 11),
|
||||
),
|
||||
Text(label, style: const TextStyle(color: Colors.grey, fontSize: 11)),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
Widget _dividerCell() =>
|
||||
Container(width: 1, height: 36, color: Colors.white10);
|
||||
Widget _dividerCell() => Container(
|
||||
width: 1,
|
||||
height: 36,
|
||||
color: Colors.blue.withValues(alpha: 0.1),
|
||||
);
|
||||
}
|
||||
|
||||
class _DistractionSettingsPage extends StatelessWidget {
|
||||
@@ -196,9 +191,7 @@ class _DistractionSettingsPage extends StatelessWidget {
|
||||
Widget build(BuildContext context) {
|
||||
final settings = context.watch<SettingsService>();
|
||||
return Scaffold(
|
||||
backgroundColor: Colors.black,
|
||||
appBar: AppBar(
|
||||
backgroundColor: Colors.black,
|
||||
title: const Text(
|
||||
'Distraction Management',
|
||||
style: TextStyle(fontSize: 17),
|
||||
@@ -211,52 +204,30 @@ class _DistractionSettingsPage extends StatelessWidget {
|
||||
body: ListView(
|
||||
children: [
|
||||
SwitchListTile(
|
||||
title: const Text(
|
||||
'Blur Explore feed',
|
||||
style: TextStyle(color: Colors.white),
|
||||
),
|
||||
title: const Text('Blur Posts and Explore'),
|
||||
subtitle: const Text(
|
||||
'Blurs posts and reels in Explore by default',
|
||||
style: TextStyle(color: Colors.white54, fontSize: 13),
|
||||
'Blurs images and videos on the home feed and Explore page',
|
||||
style: TextStyle(fontSize: 13),
|
||||
),
|
||||
value: settings.blurExplore,
|
||||
onChanged: (v) => settings.setBlurExplore(v),
|
||||
activeThumbColor: Colors.blue,
|
||||
),
|
||||
SwitchListTile(
|
||||
title: const Text(
|
||||
'Mindfulness Gate',
|
||||
style: TextStyle(color: Colors.white),
|
||||
),
|
||||
title: const Text('Mindfulness Gate'),
|
||||
subtitle: const Text(
|
||||
'Show breathing exercise before opening',
|
||||
style: TextStyle(color: Colors.white54, fontSize: 13),
|
||||
style: TextStyle(fontSize: 13),
|
||||
),
|
||||
value: settings.showBreathGate,
|
||||
onChanged: (v) => settings.setShowBreathGate(v),
|
||||
activeThumbColor: Colors.blue,
|
||||
),
|
||||
SwitchListTile(
|
||||
title: const Text(
|
||||
'Long-press for Session',
|
||||
style: TextStyle(color: Colors.white),
|
||||
),
|
||||
subtitle: const Text(
|
||||
'Requires 2s hold to start a Reel session',
|
||||
style: TextStyle(color: Colors.white54, fontSize: 13),
|
||||
),
|
||||
value: settings.requireLongPress,
|
||||
onChanged: (v) => settings.setRequireLongPress(v),
|
||||
activeThumbColor: Colors.blue,
|
||||
),
|
||||
SwitchListTile(
|
||||
title: const Text(
|
||||
'Strict Changes (Word Challenge)',
|
||||
style: TextStyle(color: Colors.white),
|
||||
),
|
||||
title: const Text('Strict Changes (Word Challenge)'),
|
||||
subtitle: const Text(
|
||||
'Requires 15-word typing challenge before lax changes',
|
||||
style: TextStyle(color: Colors.white54, fontSize: 13),
|
||||
style: TextStyle(fontSize: 13),
|
||||
),
|
||||
value: settings.requireWordChallenge,
|
||||
onChanged: (v) => settings.setRequireWordChallenge(v),
|
||||
@@ -268,8 +239,6 @@ class _DistractionSettingsPage extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
|
||||
/// Stateful slider tile that shows a friction dialog when the user moves the
|
||||
/// slider to a value greater than the current persisted value.
|
||||
class _FrictionSliderTile extends StatefulWidget {
|
||||
final String title;
|
||||
final String subtitle;
|
||||
@@ -320,13 +289,10 @@ class _FrictionSliderTileState extends State<_FrictionSliderTile> {
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
ListTile(
|
||||
title: Text(
|
||||
widget.title,
|
||||
style: const TextStyle(color: Colors.white),
|
||||
),
|
||||
title: Text(widget.title),
|
||||
subtitle: Text(
|
||||
'${_draftValue.toInt()} min',
|
||||
style: const TextStyle(color: Colors.white70, fontSize: 13),
|
||||
style: const TextStyle(fontSize: 13),
|
||||
),
|
||||
trailing: _pendingConfirm
|
||||
? Row(
|
||||
@@ -339,10 +305,7 @@ class _FrictionSliderTileState extends State<_FrictionSliderTile> {
|
||||
_pendingConfirm = false;
|
||||
});
|
||||
},
|
||||
child: const Text(
|
||||
'Cancel',
|
||||
style: TextStyle(color: Colors.white38),
|
||||
),
|
||||
child: const Text('Cancel'),
|
||||
),
|
||||
ElevatedButton(
|
||||
onPressed: () async {
|
||||
@@ -413,19 +376,10 @@ class _ExtrasSettingsPage extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final settings = context.watch<SettingsService>();
|
||||
final allTabs = [
|
||||
'Home',
|
||||
'Search',
|
||||
'Create',
|
||||
'Notifications',
|
||||
'Reels',
|
||||
'Profile',
|
||||
];
|
||||
final isDark = settings.isDarkMode;
|
||||
|
||||
return Scaffold(
|
||||
backgroundColor: Colors.black,
|
||||
appBar: AppBar(
|
||||
backgroundColor: Colors.black,
|
||||
title: const Text('Extras', style: TextStyle(fontSize: 17)),
|
||||
leading: IconButton(
|
||||
icon: const Icon(Icons.arrow_back_ios_new, size: 18),
|
||||
@@ -435,59 +389,48 @@ class _ExtrasSettingsPage extends StatelessWidget {
|
||||
body: ListView(
|
||||
children: [
|
||||
const _SettingsSectionHeader(title: 'EXPERIMENT'),
|
||||
SwitchListTile(
|
||||
title: const Text(
|
||||
'Ghost Mode',
|
||||
style: TextStyle(color: Colors.white),
|
||||
ListTile(
|
||||
onTap: () => Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(builder: (_) => const _GhostModeSettingsPage()),
|
||||
),
|
||||
subtitle: const Text(
|
||||
'Hides "typing..." and "seen" status in DMs',
|
||||
style: TextStyle(color: Colors.white54, fontSize: 13),
|
||||
leading: Icon(
|
||||
Icons.visibility_off_outlined,
|
||||
color: isDark ? Colors.white70 : Colors.black87,
|
||||
),
|
||||
value: settings.ghostMode,
|
||||
onChanged: (v) => settings.setGhostMode(v),
|
||||
activeThumbColor: Colors.blue,
|
||||
title: const Text('Ghost Mode'),
|
||||
subtitle: Text(
|
||||
settings.anyGhostModeEnabled
|
||||
? 'Active — some receipts are hidden'
|
||||
: 'Disabled',
|
||||
style: TextStyle(
|
||||
color: settings.anyGhostModeEnabled
|
||||
? Colors.blue
|
||||
: (isDark ? Colors.white38 : Colors.black38),
|
||||
fontSize: 13,
|
||||
),
|
||||
),
|
||||
trailing: const Icon(Icons.chevron_right),
|
||||
),
|
||||
SwitchListTile(
|
||||
title: const Text(
|
||||
'Enable Text Selection',
|
||||
style: TextStyle(color: Colors.white),
|
||||
),
|
||||
title: const Text('Enable Text Selection'),
|
||||
subtitle: const Text(
|
||||
'Allows copying text from posts and captions',
|
||||
style: TextStyle(color: Colors.white54, fontSize: 13),
|
||||
style: TextStyle(fontSize: 13),
|
||||
),
|
||||
value: settings.enableTextSelection,
|
||||
onChanged: (v) => settings.setEnableTextSelection(v),
|
||||
activeThumbColor: Colors.blue,
|
||||
),
|
||||
const _SettingsSectionHeader(title: 'BOTTOM BAR'),
|
||||
const SizedBox(height: 24),
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
||||
child: Wrap(
|
||||
spacing: 8,
|
||||
children: allTabs.map((tab) {
|
||||
final isEnabled = settings.enabledTabs.contains(tab);
|
||||
return FilterChip(
|
||||
label: Text(tab),
|
||||
selected: isEnabled,
|
||||
onSelected: (_) => settings.toggleTab(tab),
|
||||
backgroundColor: Colors.white10,
|
||||
selectedColor: Colors.blue.withValues(alpha: 0.3),
|
||||
checkmarkColor: Colors.blue,
|
||||
labelStyle: TextStyle(
|
||||
color: isEnabled ? Colors.blue : Colors.white60,
|
||||
fontSize: 12,
|
||||
),
|
||||
);
|
||||
}).toList(),
|
||||
),
|
||||
),
|
||||
const Padding(
|
||||
padding: EdgeInsets.fromLTRB(16, 4, 16, 16),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||
child: Text(
|
||||
'Toggle tabs to customize your navigation bar. At least one tab must be enabled.',
|
||||
style: TextStyle(color: Colors.white24, fontSize: 11),
|
||||
'Experimental features: Some features may break if Instagram updates their website.',
|
||||
style: TextStyle(
|
||||
color: isDark ? Colors.white24 : Colors.black26,
|
||||
fontSize: 11,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -516,3 +459,243 @@ class _SettingsSectionHeader extends StatelessWidget {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _GhostModeSettingsPage extends StatelessWidget {
|
||||
const _GhostModeSettingsPage();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final settings = context.watch<SettingsService>();
|
||||
final isDark = settings.isDarkMode;
|
||||
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: const Text('Ghost Mode', style: TextStyle(fontSize: 17)),
|
||||
leading: IconButton(
|
||||
icon: const Icon(Icons.arrow_back_ios_new, size: 18),
|
||||
onPressed: () => Navigator.pop(context),
|
||||
),
|
||||
),
|
||||
body: ListView(
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16, 16, 16, 4),
|
||||
child: Text(
|
||||
'Control which activity receipts are hidden from other users. ',
|
||||
style: TextStyle(
|
||||
color: isDark ? Colors.white38 : Colors.black45,
|
||||
fontSize: 12,
|
||||
height: 1.4,
|
||||
),
|
||||
),
|
||||
),
|
||||
const _SettingsSectionHeader(title: 'MESSAGING'),
|
||||
SwitchListTile(
|
||||
secondary: Icon(
|
||||
Icons.keyboard_outlined,
|
||||
color: isDark ? Colors.white54 : Colors.black54,
|
||||
),
|
||||
title: const Text('Hide typing indicator'),
|
||||
subtitle: Text(
|
||||
"Others won't see the 'typing...' status when you write a message",
|
||||
style: TextStyle(
|
||||
color: isDark ? Colors.white38 : Colors.black45,
|
||||
fontSize: 12,
|
||||
),
|
||||
),
|
||||
value: settings.ghostTyping,
|
||||
onChanged: (v) => settings.setGhostTyping(v),
|
||||
activeThumbColor: Colors.blue,
|
||||
),
|
||||
Stack(
|
||||
children: [
|
||||
AbsorbPointer(
|
||||
child: Opacity(
|
||||
opacity: 0.5,
|
||||
child: SwitchListTile(
|
||||
secondary: Icon(
|
||||
Icons.done_all_rounded,
|
||||
color: isDark ? Colors.white54 : Colors.black54,
|
||||
),
|
||||
title: const Text('Hide seen status'),
|
||||
subtitle: Text(
|
||||
"Others won't see when you've read their DMs",
|
||||
style: TextStyle(
|
||||
color: isDark ? Colors.white38 : Colors.black45,
|
||||
fontSize: 12,
|
||||
),
|
||||
),
|
||||
value: settings.ghostSeen,
|
||||
onChanged: (v) => settings.setGhostSeen(v),
|
||||
activeThumbColor: Colors.blue,
|
||||
),
|
||||
),
|
||||
),
|
||||
Positioned(
|
||||
right: 16,
|
||||
top: 0,
|
||||
bottom: 0,
|
||||
child: Center(
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
vertical: 4,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.blue.withValues(alpha: 0.2),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
border: Border.all(color: Colors.blue, width: 0.5),
|
||||
),
|
||||
child: const Text(
|
||||
'COMING SOON',
|
||||
style: TextStyle(
|
||||
color: Colors.blue,
|
||||
fontSize: 10,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
SwitchListTile(
|
||||
secondary: Icon(
|
||||
Icons.image_outlined,
|
||||
color: isDark ? Colors.white54 : Colors.black54,
|
||||
),
|
||||
title: const Text('Hide DM photo seen status'),
|
||||
subtitle: Text(
|
||||
'Prevents Instagram from marking photos/videos in DMs as viewed',
|
||||
style: TextStyle(
|
||||
color: isDark ? Colors.white38 : Colors.black45,
|
||||
fontSize: 12,
|
||||
),
|
||||
),
|
||||
value: settings.ghostDmPhotos,
|
||||
onChanged: (v) => settings.setGhostDmPhotos(v),
|
||||
activeThumbColor: Colors.blue,
|
||||
),
|
||||
const _SettingsSectionHeader(title: 'STORIES'),
|
||||
SwitchListTile(
|
||||
secondary: Icon(
|
||||
Icons.auto_stories_outlined,
|
||||
color: isDark ? Colors.white54 : Colors.black54,
|
||||
),
|
||||
title: const Text('Story ghost mode'),
|
||||
subtitle: Text(
|
||||
'Watch stories without appearing in the viewer list',
|
||||
style: TextStyle(
|
||||
color: isDark ? Colors.white38 : Colors.black45,
|
||||
fontSize: 12,
|
||||
),
|
||||
),
|
||||
value: settings.ghostStories,
|
||||
onChanged: (v) => settings.setGhostStories(v),
|
||||
activeThumbColor: Colors.blue,
|
||||
),
|
||||
const SizedBox(height: 32),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _NotificationSettingsPage extends StatelessWidget {
|
||||
const _NotificationSettingsPage();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final settings = context.watch<SettingsService>();
|
||||
final isDark = settings.isDarkMode;
|
||||
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: const Text('Notifications', style: TextStyle(fontSize: 17)),
|
||||
leading: IconButton(
|
||||
icon: const Icon(Icons.arrow_back_ios_new, size: 18),
|
||||
onPressed: () => Navigator.pop(context),
|
||||
),
|
||||
),
|
||||
body: ListView(
|
||||
children: [
|
||||
Container(
|
||||
margin: const EdgeInsets.all(16),
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.blue.withValues(alpha: 0.1),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: Border.all(color: Colors.blue.withValues(alpha: 0.3)),
|
||||
),
|
||||
child: Column(
|
||||
children: [
|
||||
const Row(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.info_outline,
|
||||
color: Colors.blueAccent,
|
||||
size: 20,
|
||||
),
|
||||
SizedBox(width: 12),
|
||||
Text(
|
||||
'Important Note',
|
||||
style: TextStyle(
|
||||
color: Colors.blueAccent,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 10),
|
||||
Text(
|
||||
'FocusGram monitors your session locally. For notifications to work, the app must be running in the background (minimized). If you force-close or swipe away the app from your task switcher, notifications will stop until you reopen it.',
|
||||
style: TextStyle(
|
||||
color: isDark ? Colors.white70 : Colors.black87,
|
||||
fontSize: 13,
|
||||
height: 1.4,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
SwitchListTile(
|
||||
secondary: const Icon(Icons.mail_outline, color: Colors.blueAccent),
|
||||
title: const Text('Direct Messages'),
|
||||
subtitle: const Text(
|
||||
'Notify when you receive a new DM',
|
||||
style: TextStyle(fontSize: 13),
|
||||
),
|
||||
value: settings.notifyDMs,
|
||||
onChanged: (v) => settings.setNotifyDMs(v),
|
||||
activeThumbColor: Colors.blue,
|
||||
),
|
||||
SwitchListTile(
|
||||
secondary: const Icon(
|
||||
Icons.favorite_border,
|
||||
color: Colors.blueAccent,
|
||||
),
|
||||
title: const Text('General Activity'),
|
||||
subtitle: const Text(
|
||||
'Likes, mentions, and other interactions',
|
||||
style: TextStyle(fontSize: 13),
|
||||
),
|
||||
value: settings.notifyActivity,
|
||||
onChanged: (v) => settings.setNotifyActivity(v),
|
||||
activeThumbColor: Colors.blue,
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||
child: Text(
|
||||
'Note: Push notifications are generated by the app local service by monitoring the web sessions. This does not rely on Instagram servers sending notifications to your device.',
|
||||
style: TextStyle(
|
||||
color: isDark ? Colors.white24 : Colors.black26,
|
||||
fontSize: 11,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
||||
/// Lightweight global router for cross-widget navigation signals.
|
||||
/// Used to allow the Settings page to trigger WebView navigations without
|
||||
/// requiring a BuildContext reference to MainWebViewPage.
|
||||
class FocusGramRouter {
|
||||
FocusGramRouter._();
|
||||
|
||||
/// When this value is non-null, [MainWebViewPage] will load the URL
|
||||
/// in the WebView and clear this value. Settings page sets this to
|
||||
/// trigger in-app navigation (e.g. Instagram Settings).
|
||||
static final pendingUrl = ValueNotifier<String?>(null);
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,8 +9,9 @@ class NavigationGuard {
|
||||
static const _allowedHosts = ['instagram.com', 'www.instagram.com'];
|
||||
|
||||
/// Regex matching the Reels FEED root — NOT individual reels.
|
||||
/// The `(/|\?|$)` suffix ensures query params (e.g. ?fg=blocked) still match.
|
||||
static final _reelsFeedRegex = RegExp(
|
||||
r'instagram\.com/reels/?$',
|
||||
r'instagram\.com/reels(/|\?|$)',
|
||||
caseSensitive: false,
|
||||
);
|
||||
|
||||
@@ -36,7 +37,7 @@ class NavigationGuard {
|
||||
|
||||
// Block non-Instagram domains (prevents phishing/external redirects)
|
||||
final host = uri.host.toLowerCase();
|
||||
if (!_allowedHosts.any((h) => host == h || host.endsWith('.$h'))) {
|
||||
if (!_allowedHosts.any((h) => host == h)) {
|
||||
return BlockDecision(
|
||||
blocked: true,
|
||||
reason: 'External domain blocked: $host',
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
|
||||
|
||||
class NotificationService {
|
||||
@@ -59,11 +60,15 @@ class NotificationService {
|
||||
iOS: iosDetails,
|
||||
);
|
||||
|
||||
await _notificationsPlugin.show(
|
||||
id: id,
|
||||
title: title,
|
||||
body: body,
|
||||
notificationDetails: platformDetails,
|
||||
);
|
||||
try {
|
||||
await _notificationsPlugin.show(
|
||||
id: id,
|
||||
title: title,
|
||||
body: body,
|
||||
notificationDetails: platformDetails,
|
||||
);
|
||||
} catch (e) {
|
||||
debugPrint('Notification error: $e');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,38 @@
|
||||
import 'dart:async';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'dart:convert';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import 'notification_service.dart';
|
||||
|
||||
class FocusSchedule {
|
||||
final int startHour;
|
||||
final int startMinute;
|
||||
final int endHour;
|
||||
final int endMinute;
|
||||
|
||||
FocusSchedule({
|
||||
required this.startHour,
|
||||
required this.startMinute,
|
||||
required this.endHour,
|
||||
required this.endMinute,
|
||||
});
|
||||
|
||||
Map<String, dynamic> toJson() => {
|
||||
'startH': startHour,
|
||||
'startM': startMinute,
|
||||
'endH': endHour,
|
||||
'endM': endMinute,
|
||||
};
|
||||
|
||||
factory FocusSchedule.fromJson(Map<String, dynamic> json) => FocusSchedule(
|
||||
startHour: json['startH'] as int,
|
||||
startMinute: json['startM'] as int,
|
||||
endHour: json['endH'] as int,
|
||||
endMinute: json['endM'] as int,
|
||||
);
|
||||
}
|
||||
|
||||
/// Manages all session logic for FocusGram:
|
||||
///
|
||||
/// **App Session** — how long the user plans to use Instagram today.
|
||||
@@ -34,6 +63,7 @@ class SessionManager extends ChangeNotifier {
|
||||
static const _keyScheduleStartMin = 'sched_start_m';
|
||||
static const _keyScheduleEndHour = 'sched_end_h';
|
||||
static const _keyScheduleEndMin = 'sched_end_m';
|
||||
static const _keySchedulesJson = 'sched_list_json';
|
||||
|
||||
SharedPreferences? _prefs;
|
||||
|
||||
@@ -56,8 +86,10 @@ class SessionManager extends ChangeNotifier {
|
||||
bool _scheduleEnabled = false;
|
||||
int _schedStartHour = 22; // Default 10 PM
|
||||
int _schedStartMin = 0;
|
||||
int _schedEndHour = 7; // Default 7 AM
|
||||
int _schedEndHour = 7;
|
||||
int _schedEndMin = 0;
|
||||
List<FocusSchedule> _schedules = [];
|
||||
bool _lastScheduleState = false;
|
||||
|
||||
bool _isInForeground = true; // Tracking app lifecycle state
|
||||
int _cachedRemainingSessionSeconds = 0;
|
||||
@@ -148,21 +180,56 @@ class SessionManager extends ChangeNotifier {
|
||||
int get schedStartMin => _schedStartMin;
|
||||
int get schedEndHour => _schedEndHour;
|
||||
int get schedEndMin => _schedEndMin;
|
||||
List<FocusSchedule> get schedules => _schedules;
|
||||
|
||||
bool get isScheduledBlockActive {
|
||||
if (!_scheduleEnabled) return false;
|
||||
final now = DateTime.now();
|
||||
final currentTime = now.hour * 60 + now.minute;
|
||||
final startTime = _schedStartHour * 60 + _schedStartMin;
|
||||
final endTime = _schedEndHour * 60 + _schedEndMin;
|
||||
|
||||
if (startTime < endTime) {
|
||||
// Simple range (e.g., 9:00 to 17:00)
|
||||
return currentTime >= startTime && currentTime < endTime;
|
||||
} else {
|
||||
// Over-midnight range (e.g., 22:00 to 07:00)
|
||||
return currentTime >= startTime || currentTime < endTime;
|
||||
for (final s in _schedules) {
|
||||
final startTime = s.startHour * 60 + s.startMinute;
|
||||
final endTime = s.endHour * 60 + s.endMinute;
|
||||
|
||||
if (startTime < endTime) {
|
||||
// Simple range (e.g., 9:00 to 17:00)
|
||||
if (currentTime >= startTime && currentTime < endTime) return true;
|
||||
} else {
|
||||
// Over-midnight range (e.g., 22:00 to 07:00)
|
||||
if (currentTime >= startTime || currentTime < endTime) return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
String? get activeScheduleText {
|
||||
if (!isScheduledBlockActive) return null;
|
||||
final now = DateTime.now();
|
||||
final currentTime = now.hour * 60 + now.minute;
|
||||
|
||||
for (final s in _schedules) {
|
||||
final startTime = s.startHour * 60 + s.startMinute;
|
||||
final endTime = s.endHour * 60 + s.endMinute;
|
||||
|
||||
bool active = false;
|
||||
if (startTime < endTime) {
|
||||
if (currentTime >= startTime && currentTime < endTime) active = true;
|
||||
} else {
|
||||
if (currentTime >= startTime || currentTime < endTime) active = true;
|
||||
}
|
||||
if (active) {
|
||||
return '${formatTime12h(s.startHour, s.startMinute)} to ${formatTime12h(s.endHour, s.endMinute)}';
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
String formatTime12h(int h, int m) {
|
||||
var hour = h % 12;
|
||||
if (hour == 0) hour = 12;
|
||||
final period = h >= 12 ? 'PM' : 'AM';
|
||||
final min = m.toString().padLeft(2, '0');
|
||||
return '$hour:$min $period';
|
||||
}
|
||||
|
||||
// ── Initialization ─────────────────────────────────────────
|
||||
@@ -170,6 +237,7 @@ class SessionManager extends ChangeNotifier {
|
||||
_prefs = await SharedPreferences.getInstance();
|
||||
await _resetDailyIfNeeded();
|
||||
_loadPersisted();
|
||||
_lastScheduleState = isScheduledBlockActive;
|
||||
_startTicker();
|
||||
_incrementOpenCount();
|
||||
}
|
||||
@@ -249,6 +317,23 @@ class SessionManager extends ChangeNotifier {
|
||||
_schedStartMin = _prefs!.getInt(_keyScheduleStartMin) ?? 0;
|
||||
_schedEndHour = _prefs!.getInt(_keyScheduleEndHour) ?? 7;
|
||||
_schedEndMin = _prefs!.getInt(_keyScheduleEndMin) ?? 0;
|
||||
|
||||
final schedJson = _prefs!.getString(_keySchedulesJson);
|
||||
if (schedJson != null) {
|
||||
final List decode = jsonDecode(schedJson);
|
||||
_schedules = decode.map((m) => FocusSchedule.fromJson(m)).toList();
|
||||
} else {
|
||||
// Migrate old single schedule if it exists
|
||||
_schedules = [
|
||||
FocusSchedule(
|
||||
startHour: _schedStartHour,
|
||||
startMinute: _schedStartMin,
|
||||
endHour: _schedEndHour,
|
||||
endMinute: _schedEndMin,
|
||||
),
|
||||
];
|
||||
_saveSchedulesToPrefs();
|
||||
}
|
||||
}
|
||||
|
||||
void _incrementOpenCount() {
|
||||
@@ -300,6 +385,13 @@ class SessionManager extends ChangeNotifier {
|
||||
changed = true;
|
||||
}
|
||||
|
||||
// Schedule check
|
||||
final sched = isScheduledBlockActive;
|
||||
if (sched != _lastScheduleState) {
|
||||
_lastScheduleState = sched;
|
||||
changed = true;
|
||||
}
|
||||
|
||||
if (changed) notifyListeners();
|
||||
}
|
||||
|
||||
@@ -418,17 +510,53 @@ class SessionManager extends ChangeNotifier {
|
||||
required int endH,
|
||||
required int endM,
|
||||
}) async {
|
||||
_schedStartHour = startH;
|
||||
_schedStartMin = startM;
|
||||
_schedEndHour = endH;
|
||||
_schedEndMin = endM;
|
||||
// Update the first schedule for compatibility? Or just replace all?
|
||||
// Let's replace all schedules with this one if this method is called.
|
||||
_schedules = [
|
||||
FocusSchedule(
|
||||
startHour: startH,
|
||||
startMinute: startM,
|
||||
endHour: endH,
|
||||
endMinute: endM,
|
||||
),
|
||||
];
|
||||
await _prefs?.setInt(_keyScheduleStartHour, startH);
|
||||
await _prefs?.setInt(_keyScheduleStartMin, startM);
|
||||
await _prefs?.setInt(_keyScheduleEndHour, endH);
|
||||
await _prefs?.setInt(_keyScheduleEndMin, endM);
|
||||
await _saveSchedulesToPrefs();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> _saveSchedulesToPrefs() async {
|
||||
final json = jsonEncode(_schedules.map((s) => s.toJson()).toList());
|
||||
await _prefs?.setString(_keySchedulesJson, json);
|
||||
}
|
||||
|
||||
Future<void> addSchedule(FocusSchedule s) async {
|
||||
_schedules.add(s);
|
||||
await _saveSchedulesToPrefs();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> removeScheduleAt(int index) async {
|
||||
if (index >= 0 && index < _schedules.length) {
|
||||
_schedules.removeAt(index);
|
||||
await _saveSchedulesToPrefs();
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> updateScheduleAt(int index, FocusSchedule s) async {
|
||||
if (index >= 0 && index < _schedules.length) {
|
||||
_schedules[index] = s;
|
||||
await _saveSchedulesToPrefs();
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_ticker?.cancel();
|
||||
|
||||
@@ -8,13 +8,25 @@ class SettingsService extends ChangeNotifier {
|
||||
static const _keyRequireLongPress = 'set_require_long_press';
|
||||
static const _keyShowBreathGate = 'set_show_breath_gate';
|
||||
static const _keyRequireWordChallenge = 'set_require_word_challenge';
|
||||
static const _keyGhostMode = 'set_ghost_mode';
|
||||
static const _keyEnableTextSelection = 'set_enable_text_selection';
|
||||
static const _keyEnabledTabs = 'set_enabled_tabs';
|
||||
static const _keyShowInstaSettings = 'set_show_insta_settings';
|
||||
|
||||
static const _keyIsFirstRun = 'set_is_first_run';
|
||||
|
||||
// Granular Ghost Mode keys
|
||||
static const _keyGhostTyping = 'set_ghost_typing';
|
||||
static const _keyGhostSeen = 'set_ghost_seen';
|
||||
static const _keyGhostStories = 'set_ghost_stories';
|
||||
static const _keyGhostDmPhotos = 'set_ghost_dm_photos';
|
||||
|
||||
// Privacy keys
|
||||
static const _keySanitizeLinks = 'set_sanitize_links';
|
||||
static const _keyNotifyDMs = 'set_notify_dms';
|
||||
static const _keyNotifyActivity = 'set_notify_activity';
|
||||
|
||||
// Legacy key for migration
|
||||
static const _keyGhostModeLegacy = 'set_ghost_mode';
|
||||
|
||||
SharedPreferences? _prefs;
|
||||
|
||||
bool _blurExplore = true;
|
||||
@@ -22,10 +34,28 @@ class SettingsService extends ChangeNotifier {
|
||||
bool _requireLongPress = true;
|
||||
bool _showBreathGate = true;
|
||||
bool _requireWordChallenge = true;
|
||||
bool _ghostMode = true;
|
||||
bool _enableTextSelection = false;
|
||||
bool _showInstaSettings = true;
|
||||
List<String> _enabledTabs = ['Home', 'Search', 'Create', 'Reels', 'Profile'];
|
||||
bool _isDarkMode = true; // Default to dark as per existing app theme
|
||||
|
||||
// Granular Ghost Mode defaults (all on)
|
||||
bool _ghostTyping = true;
|
||||
bool _ghostSeen = true;
|
||||
bool _ghostStories = true;
|
||||
bool _ghostDmPhotos = true;
|
||||
|
||||
// Privacy defaults
|
||||
bool _sanitizeLinks = true;
|
||||
bool _notifyDMs = true;
|
||||
bool _notifyActivity = true;
|
||||
|
||||
List<String> _enabledTabs = [
|
||||
'Home',
|
||||
'Search',
|
||||
'Reels',
|
||||
'Messages',
|
||||
'Profile',
|
||||
];
|
||||
bool _isFirstRun = true;
|
||||
|
||||
bool get blurExplore => _blurExplore;
|
||||
@@ -33,11 +63,26 @@ class SettingsService extends ChangeNotifier {
|
||||
bool get requireLongPress => _requireLongPress;
|
||||
bool get showBreathGate => _showBreathGate;
|
||||
bool get requireWordChallenge => _requireWordChallenge;
|
||||
bool get ghostMode => _ghostMode;
|
||||
bool get enableTextSelection => _enableTextSelection;
|
||||
bool get showInstaSettings => _showInstaSettings;
|
||||
List<String> get enabledTabs => _enabledTabs;
|
||||
bool get isFirstRun => _isFirstRun;
|
||||
bool get isDarkMode => _isDarkMode;
|
||||
|
||||
// Granular Ghost Mode getters
|
||||
bool get ghostTyping => _ghostTyping;
|
||||
bool get ghostSeen => _ghostSeen;
|
||||
bool get ghostStories => _ghostStories;
|
||||
bool get ghostDmPhotos => _ghostDmPhotos;
|
||||
bool get notifyDMs => _notifyDMs;
|
||||
bool get notifyActivity => _notifyActivity;
|
||||
|
||||
/// True if ANY ghost mode setting is enabled (for injection logic).
|
||||
bool get anyGhostModeEnabled =>
|
||||
_ghostTyping || _ghostSeen || _ghostStories || _ghostDmPhotos;
|
||||
|
||||
// Privacy getters
|
||||
bool get sanitizeLinks => _sanitizeLinks;
|
||||
|
||||
Future<void> init() async {
|
||||
_prefs = await SharedPreferences.getInstance();
|
||||
@@ -46,12 +91,42 @@ class SettingsService extends ChangeNotifier {
|
||||
_requireLongPress = _prefs!.getBool(_keyRequireLongPress) ?? true;
|
||||
_showBreathGate = _prefs!.getBool(_keyShowBreathGate) ?? true;
|
||||
_requireWordChallenge = _prefs!.getBool(_keyRequireWordChallenge) ?? true;
|
||||
_ghostMode = _prefs!.getBool(_keyGhostMode) ?? true;
|
||||
_enableTextSelection = _prefs!.getBool(_keyEnableTextSelection) ?? false;
|
||||
_showInstaSettings = _prefs!.getBool(_keyShowInstaSettings) ?? true;
|
||||
|
||||
// Migrate legacy ghostMode key -> all granular keys
|
||||
final legacyGhostMode = _prefs!.getBool(_keyGhostModeLegacy);
|
||||
if (legacyGhostMode != null) {
|
||||
// Seed all four granular keys with the legacy value
|
||||
_ghostTyping = legacyGhostMode;
|
||||
_ghostSeen = legacyGhostMode;
|
||||
_ghostStories = legacyGhostMode;
|
||||
_ghostDmPhotos = legacyGhostMode;
|
||||
// Save granular keys and remove legacy key
|
||||
await _prefs!.setBool(_keyGhostTyping, legacyGhostMode);
|
||||
await _prefs!.setBool(_keyGhostSeen, legacyGhostMode);
|
||||
await _prefs!.setBool(_keyGhostStories, legacyGhostMode);
|
||||
await _prefs!.setBool(_keyGhostDmPhotos, legacyGhostMode);
|
||||
await _prefs!.remove(_keyGhostModeLegacy);
|
||||
} else {
|
||||
_ghostTyping = _prefs!.getBool(_keyGhostTyping) ?? true;
|
||||
_ghostSeen = _prefs!.getBool(_keyGhostSeen) ?? true;
|
||||
_ghostStories = _prefs!.getBool(_keyGhostStories) ?? true;
|
||||
_ghostDmPhotos = _prefs!.getBool(_keyGhostDmPhotos) ?? true;
|
||||
}
|
||||
|
||||
_sanitizeLinks = _prefs!.getBool(_keySanitizeLinks) ?? true;
|
||||
_notifyDMs = _prefs!.getBool(_keyNotifyDMs) ?? true;
|
||||
_notifyActivity = _prefs!.getBool(_keyNotifyActivity) ?? true;
|
||||
|
||||
_enabledTabs =
|
||||
_prefs!.getStringList(_keyEnabledTabs) ??
|
||||
['Home', 'Search', 'Create', 'Reels', 'Profile'];
|
||||
(_prefs!.getStringList(_keyEnabledTabs) ??
|
||||
['Home', 'Search', 'Reels', 'Messages', 'Profile'])
|
||||
..remove('Create');
|
||||
if (!_enabledTabs.contains('Messages') && _enabledTabs.length < 5) {
|
||||
// Migration: add Messages if missing
|
||||
_enabledTabs.insert(3, 'Messages');
|
||||
}
|
||||
_isFirstRun = _prefs!.getBool(_keyIsFirstRun) ?? true;
|
||||
notifyListeners();
|
||||
}
|
||||
@@ -92,12 +167,6 @@ class SettingsService extends ChangeNotifier {
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> setGhostMode(bool v) async {
|
||||
_ghostMode = v;
|
||||
await _prefs?.setBool(_keyGhostMode, v);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> setEnableTextSelection(bool v) async {
|
||||
_enableTextSelection = v;
|
||||
await _prefs?.setBool(_keyEnableTextSelection, v);
|
||||
@@ -110,6 +179,56 @@ class SettingsService extends ChangeNotifier {
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void setDarkMode(bool dark) {
|
||||
if (_isDarkMode != dark) {
|
||||
_isDarkMode = dark;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
// Granular Ghost Mode setters
|
||||
Future<void> setGhostTyping(bool v) async {
|
||||
_ghostTyping = v;
|
||||
await _prefs?.setBool(_keyGhostTyping, v);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> setGhostSeen(bool v) async {
|
||||
_ghostSeen = v;
|
||||
await _prefs?.setBool(_keyGhostSeen, v);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> setGhostStories(bool v) async {
|
||||
_ghostStories = v;
|
||||
await _prefs?.setBool(_keyGhostStories, v);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> setGhostDmPhotos(bool v) async {
|
||||
_ghostDmPhotos = v;
|
||||
await _prefs?.setBool(_keyGhostDmPhotos, v);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> setSanitizeLinks(bool v) async {
|
||||
_sanitizeLinks = v;
|
||||
await _prefs?.setBool(_keySanitizeLinks, v);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> setNotifyDMs(bool v) async {
|
||||
_notifyDMs = v;
|
||||
await _prefs?.setBool(_keyNotifyDMs, v);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> setNotifyActivity(bool v) async {
|
||||
_notifyActivity = v;
|
||||
await _prefs?.setBool(_keyNotifyActivity, v);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> toggleTab(String tab) async {
|
||||
if (_enabledTabs.contains(tab)) {
|
||||
if (_enabledTabs.length > 1) {
|
||||
@@ -121,4 +240,12 @@ class SettingsService extends ChangeNotifier {
|
||||
await _prefs?.setStringList(_keyEnabledTabs, _enabledTabs);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> reorderTab(int oldIndex, int newIndex) async {
|
||||
if (newIndex > oldIndex) newIndex -= 1;
|
||||
final String item = _enabledTabs.removeAt(oldIndex);
|
||||
_enabledTabs.insert(newIndex, item);
|
||||
await _prefs?.setStringList(_keyEnabledTabs, _enabledTabs);
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_windowmanager_plus/flutter_windowmanager_plus.dart';
|
||||
|
||||
class DisciplineChallenge {
|
||||
static const List<String> _words = [
|
||||
@@ -516,11 +517,20 @@ class DisciplineChallenge {
|
||||
];
|
||||
|
||||
/// Shows the word challenge dialog. Returns true if successful.
|
||||
static Future<bool> show(BuildContext context) async {
|
||||
static Future<bool> show(BuildContext context, {int count = 15}) async {
|
||||
final list = List<String>.from(_words)..shuffle();
|
||||
final challenge = list.take(15).join(' ');
|
||||
final challenge = list.take(count).join(' ');
|
||||
final controller = TextEditingController();
|
||||
|
||||
// Prevent screenshots on Android
|
||||
try {
|
||||
await FlutterWindowManagerPlus.addFlags(
|
||||
FlutterWindowManagerPlus.FLAG_SECURE,
|
||||
);
|
||||
} catch (_) {}
|
||||
|
||||
if (!context.mounted) return false;
|
||||
|
||||
final result = await showDialog<bool>(
|
||||
context: context,
|
||||
barrierDismissible: false,
|
||||
@@ -569,6 +579,8 @@ class DisciplineChallenge {
|
||||
TextField(
|
||||
controller: controller,
|
||||
autofocus: true,
|
||||
enableInteractiveSelection:
|
||||
false, // Prevents copy/paste/selection
|
||||
style: const TextStyle(color: Colors.white),
|
||||
decoration: InputDecoration(
|
||||
hintText: 'Type here...',
|
||||
@@ -616,6 +628,14 @@ class DisciplineChallenge {
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
// Re-enable screenshots
|
||||
try {
|
||||
await FlutterWindowManagerPlus.clearFlags(
|
||||
FlutterWindowManagerPlus.FLAG_SECURE,
|
||||
);
|
||||
} catch (_) {}
|
||||
|
||||
return result ?? false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
Categories:
|
||||
- Multimedia
|
||||
- Social
|
||||
License: AGPL-3.0-only
|
||||
SourceCode: https://github.com/Ujwal223/FocusGram
|
||||
IssueTracker: https://github.com/Ujwal223/FocusGram/issues
|
||||
|
||||
AutoName: FocusGram
|
||||
|
||||
RepoType: git
|
||||
Repo: https://github.com/Ujwal223/FocusGram
|
||||
|
||||
Builds:
|
||||
- versionName: '0.9.8'
|
||||
versionCode: 1
|
||||
commit: v0.9.8
|
||||
gradle:
|
||||
- yes
|
||||
|
||||
AutoUpdateMode: Version
|
||||
UpdateCheckMode: Tags
|
||||
CurrentVersion: '0.9.8'
|
||||
CurrentVersionCode: 1
|
||||
+177
-1
@@ -1,6 +1,46 @@
|
||||
# Generated by pub
|
||||
# See https://dart.dev/tools/pub/glossary#lockfile
|
||||
packages:
|
||||
app_links:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: app_links
|
||||
sha256: "5f88447519add627fe1cbcab4fd1da3d4fed15b9baf29f28b22535c95ecee3e8"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "6.4.1"
|
||||
app_links_linux:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: app_links_linux
|
||||
sha256: f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.0.3"
|
||||
app_links_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: app_links_platform_interface
|
||||
sha256: "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.2"
|
||||
app_links_web:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: app_links_web
|
||||
sha256: af060ed76183f9e2b87510a9480e56a5352b6c249778d07bd2c95fc35632a555
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.0.4"
|
||||
app_settings:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: app_settings
|
||||
sha256: "3e46c561441e5820d3a25339bf8b51b9e45a5f686873851a20c257a530917795"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "6.1.1"
|
||||
archive:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -81,6 +121,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.19.1"
|
||||
cross_file:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: cross_file
|
||||
sha256: "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.3.5+2"
|
||||
crypto:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -121,6 +169,38 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "7.0.1"
|
||||
file_selector_linux:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file_selector_linux
|
||||
sha256: "2567f398e06ac72dcf2e98a0c95df2a9edd03c2c2e0cacd4780f20cdf56263a0"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.9.4"
|
||||
file_selector_macos:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file_selector_macos
|
||||
sha256: "5e0bbe9c312416f1787a68259ea1505b52f258c587f12920422671807c4d618a"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.9.5"
|
||||
file_selector_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file_selector_platform_interface
|
||||
sha256: "35e0bd61ebcdb91a3505813b055b09b79dfdc7d0aee9c09a7ba59ae4bb13dc85"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.7.0"
|
||||
file_selector_windows:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file_selector_windows
|
||||
sha256: "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.9.3+5"
|
||||
flutter:
|
||||
dependency: "direct main"
|
||||
description: flutter
|
||||
@@ -174,6 +254,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.1"
|
||||
flutter_plugin_android_lifecycle:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: flutter_plugin_android_lifecycle
|
||||
sha256: ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.33"
|
||||
flutter_test:
|
||||
dependency: "direct dev"
|
||||
description: flutter
|
||||
@@ -184,6 +272,14 @@ packages:
|
||||
description: flutter
|
||||
source: sdk
|
||||
version: "0.0.0"
|
||||
flutter_windowmanager_plus:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: flutter_windowmanager_plus
|
||||
sha256: "4e2bf7c7f374699fd74d59785f1d74efd40052c24a5edde5a4d825cc72608d40"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.0.1"
|
||||
glob:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -200,6 +296,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "8.0.2"
|
||||
gtk:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: gtk
|
||||
sha256: e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.0"
|
||||
hooks:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -232,6 +336,70 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.8.0"
|
||||
image_picker:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: image_picker
|
||||
sha256: "784210112be18ea55f69d7076e2c656a4e24949fa9e76429fe53af0c0f4fa320"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.2.1"
|
||||
image_picker_android:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: image_picker_android
|
||||
sha256: eda9b91b7e266d9041084a42d605a74937d996b87083395c5e47835916a86156
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.8.13+14"
|
||||
image_picker_for_web:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: image_picker_for_web
|
||||
sha256: "66257a3191ab360d23a55c8241c91a6e329d31e94efa7be9cf7a212e65850214"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.1.1"
|
||||
image_picker_ios:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: image_picker_ios
|
||||
sha256: b9c4a438a9ff4f60808c9cf0039b93a42bb6c2211ef6ebb647394b2b3fa84588
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.8.13+6"
|
||||
image_picker_linux:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: image_picker_linux
|
||||
sha256: "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.2.2"
|
||||
image_picker_macos:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: image_picker_macos
|
||||
sha256: "86f0f15a309de7e1a552c12df9ce5b59fe927e71385329355aec4776c6a8ec91"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.2.2+1"
|
||||
image_picker_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: image_picker_platform_interface
|
||||
sha256: "567e056716333a1647c64bb6bd873cff7622233a5c3f694be28a583d4715690c"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.11.1"
|
||||
image_picker_windows:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: image_picker_windows
|
||||
sha256: d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.2.2"
|
||||
intl:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@@ -312,6 +480,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.17.0"
|
||||
mime:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: mime
|
||||
sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.0"
|
||||
native_toolchain_c:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -710,7 +886,7 @@ packages:
|
||||
source: hosted
|
||||
version: "4.13.1"
|
||||
webview_flutter_android:
|
||||
dependency: transitive
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: webview_flutter_android
|
||||
sha256: eeeb3fcd5f0ff9f8446c9f4bbc18a99b809e40297528a3395597d03aafb9f510
|
||||
|
||||
+10
-1
@@ -2,7 +2,7 @@ name: focusgram
|
||||
description: "FocusGram — Distraction-free Instagram WebView wrapper."
|
||||
publish_to: 'none'
|
||||
|
||||
version: 1.0.0+1
|
||||
version: 0.9.8+1
|
||||
|
||||
environment:
|
||||
sdk: ^3.10.7
|
||||
@@ -13,6 +13,8 @@ dependencies:
|
||||
|
||||
# WebView engine — latest stable
|
||||
webview_flutter: ^4.13.1
|
||||
# Android-specific WebView platform (explicit dep required for direct import)
|
||||
webview_flutter_android: ^4.3.0
|
||||
|
||||
# Local key-value persistence — latest stable
|
||||
shared_preferences: ^2.5.4
|
||||
@@ -28,9 +30,16 @@ dependencies:
|
||||
|
||||
# URL launcher for About page links — latest stable
|
||||
url_launcher: ^6.3.2
|
||||
# Handling Instagram deep links — latest stable
|
||||
app_links: ^6.3.2
|
||||
# Open system settings — latest stable
|
||||
app_settings: ^6.1.1
|
||||
google_fonts: ^8.0.2
|
||||
http: ^1.3.0
|
||||
permission_handler: ^12.0.1
|
||||
# Image/file picker for story uploads on Android
|
||||
image_picker: ^1.1.2
|
||||
flutter_windowmanager_plus: ^1.0.1
|
||||
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
// test/services/focusgram_router_test.dart
|
||||
//
|
||||
// Tests for FocusGramRouter — the lightweight cross-widget URL notifier.
|
||||
//
|
||||
// Run with: flutter test test/services/focusgram_router_test.dart
|
||||
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:focusgram/services/focusgram_router.dart';
|
||||
|
||||
void main() {
|
||||
// Reset between tests so state does not bleed across
|
||||
tearDown(() {
|
||||
FocusGramRouter.pendingUrl.value = null;
|
||||
});
|
||||
|
||||
group('FocusGramRouter.pendingUrl', () {
|
||||
test('initial value is null', () {
|
||||
expect(FocusGramRouter.pendingUrl.value, isNull);
|
||||
});
|
||||
|
||||
test('can be set to a URL string', () {
|
||||
FocusGramRouter.pendingUrl.value =
|
||||
'https://www.instagram.com/accounts/settings/';
|
||||
expect(
|
||||
FocusGramRouter.pendingUrl.value,
|
||||
'https://www.instagram.com/accounts/settings/',
|
||||
);
|
||||
});
|
||||
|
||||
test('can be cleared back to null', () {
|
||||
FocusGramRouter.pendingUrl.value = 'https://www.instagram.com/';
|
||||
FocusGramRouter.pendingUrl.value = null;
|
||||
expect(FocusGramRouter.pendingUrl.value, isNull);
|
||||
});
|
||||
|
||||
test('notifies listeners when value changes', () {
|
||||
bool notified = false;
|
||||
void listener() => notified = true;
|
||||
FocusGramRouter.pendingUrl.addListener(listener);
|
||||
|
||||
FocusGramRouter.pendingUrl.value = 'https://www.instagram.com/';
|
||||
|
||||
expect(notified, isTrue);
|
||||
FocusGramRouter.pendingUrl.removeListener(listener);
|
||||
});
|
||||
|
||||
test('does NOT notify when value is set to same value', () {
|
||||
FocusGramRouter.pendingUrl.value = 'https://x.com/';
|
||||
int callCount = 0;
|
||||
void listener() => callCount++;
|
||||
FocusGramRouter.pendingUrl.addListener(listener);
|
||||
|
||||
// Setting to the exact same value should not notify
|
||||
FocusGramRouter.pendingUrl.value = 'https://x.com/';
|
||||
expect(callCount, 0);
|
||||
|
||||
FocusGramRouter.pendingUrl.removeListener(listener);
|
||||
});
|
||||
|
||||
test('is a singleton — same instance across multiple accesses', () {
|
||||
final a = FocusGramRouter.pendingUrl;
|
||||
final b = FocusGramRouter.pendingUrl;
|
||||
expect(identical(a, b), isTrue);
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,372 @@
|
||||
// test/services/injection_controller_test.dart
|
||||
//
|
||||
// Tests for InjectionController — JS/CSS builder, Ghost Mode keyword resolver,
|
||||
// and JS string generation.
|
||||
//
|
||||
// Run with: flutter test test/services/injection_controller_test.dart
|
||||
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:focusgram/services/injection_controller.dart';
|
||||
|
||||
void main() {
|
||||
// ── resolveBlockedKeywords ───────────────────────────────────────────────
|
||||
|
||||
group('InjectionController.resolveBlockedKeywords', () {
|
||||
test('returns empty list when all flags are false', () {
|
||||
final kws = InjectionController.resolveBlockedKeywords(
|
||||
typingIndicator: false,
|
||||
seenStatus: false,
|
||||
stories: false,
|
||||
dmPhotos: false,
|
||||
);
|
||||
expect(kws, isEmpty);
|
||||
});
|
||||
|
||||
test('includes seen keywords when seenStatus is true', () {
|
||||
final kws = InjectionController.resolveBlockedKeywords(
|
||||
typingIndicator: false,
|
||||
seenStatus: true,
|
||||
stories: false,
|
||||
dmPhotos: false,
|
||||
);
|
||||
expect(
|
||||
kws,
|
||||
containsAll(['/seen', 'media/seen', 'reel/seen', '/mark_seen']),
|
||||
);
|
||||
});
|
||||
|
||||
test('includes typing keywords when typingIndicator is true', () {
|
||||
final kws = InjectionController.resolveBlockedKeywords(
|
||||
typingIndicator: true,
|
||||
seenStatus: false,
|
||||
stories: false,
|
||||
dmPhotos: false,
|
||||
);
|
||||
expect(kws, containsAll(['set_typing_status', '/typing']));
|
||||
});
|
||||
|
||||
test('includes live keywords when stories is true', () {
|
||||
final kws = InjectionController.resolveBlockedKeywords(
|
||||
typingIndicator: false,
|
||||
seenStatus: false,
|
||||
stories: true,
|
||||
dmPhotos: false,
|
||||
);
|
||||
expect(kws, contains('/live/'));
|
||||
});
|
||||
|
||||
test('includes visual_item_seen when dmPhotos is true', () {
|
||||
final kws = InjectionController.resolveBlockedKeywords(
|
||||
typingIndicator: false,
|
||||
seenStatus: false,
|
||||
stories: false,
|
||||
dmPhotos: true,
|
||||
);
|
||||
expect(kws, contains('visual_item_seen'));
|
||||
});
|
||||
|
||||
test('all flags true — returns all groups combined', () {
|
||||
final kws = InjectionController.resolveBlockedKeywords(
|
||||
typingIndicator: true,
|
||||
seenStatus: true,
|
||||
stories: true,
|
||||
dmPhotos: true,
|
||||
);
|
||||
// Must contain at least one keyword from every group
|
||||
expect(
|
||||
kws,
|
||||
containsAll([
|
||||
'/seen',
|
||||
'set_typing_status',
|
||||
'/live/',
|
||||
'visual_item_seen',
|
||||
]),
|
||||
);
|
||||
});
|
||||
|
||||
test('no duplicates in result (seen + typing + stories + dmPhotos)', () {
|
||||
final kws = InjectionController.resolveBlockedKeywords(
|
||||
typingIndicator: true,
|
||||
seenStatus: true,
|
||||
stories: true,
|
||||
dmPhotos: true,
|
||||
);
|
||||
final unique = kws.toSet();
|
||||
expect(kws.length, unique.length);
|
||||
});
|
||||
});
|
||||
|
||||
// ── resolveWsBlockedKeywords ─────────────────────────────────────────────
|
||||
|
||||
group('InjectionController.resolveWsBlockedKeywords', () {
|
||||
test('returns empty list when typingIndicator is false', () {
|
||||
expect(
|
||||
InjectionController.resolveWsBlockedKeywords(typingIndicator: false),
|
||||
isEmpty,
|
||||
);
|
||||
});
|
||||
|
||||
test('returns non-empty list when typingIndicator is true', () {
|
||||
final kws = InjectionController.resolveWsBlockedKeywords(
|
||||
typingIndicator: true,
|
||||
);
|
||||
expect(kws, isNotEmpty);
|
||||
expect(kws, contains('activity_status'));
|
||||
});
|
||||
});
|
||||
|
||||
// ── buildGhostModeJS ─────────────────────────────────────────────────────
|
||||
|
||||
group('InjectionController.buildGhostModeJS', () {
|
||||
test('returns empty string when all flags are false', () {
|
||||
final js = InjectionController.buildGhostModeJS(
|
||||
typingIndicator: false,
|
||||
seenStatus: false,
|
||||
stories: false,
|
||||
dmPhotos: false,
|
||||
);
|
||||
expect(js.trim(), isEmpty);
|
||||
});
|
||||
|
||||
test('generated JS contains seen keywords when seenStatus=true', () {
|
||||
final js = InjectionController.buildGhostModeJS(
|
||||
typingIndicator: false,
|
||||
seenStatus: true,
|
||||
stories: false,
|
||||
dmPhotos: false,
|
||||
);
|
||||
expect(js, contains('/seen'));
|
||||
expect(js, contains('media/seen'));
|
||||
});
|
||||
|
||||
test('generated JS contains typing keywords when typingIndicator=true', () {
|
||||
final js = InjectionController.buildGhostModeJS(
|
||||
typingIndicator: true,
|
||||
seenStatus: false,
|
||||
stories: false,
|
||||
dmPhotos: false,
|
||||
);
|
||||
expect(js, contains('set_typing_status'));
|
||||
});
|
||||
|
||||
test('generated JS contains live keyword when stories=true', () {
|
||||
final js = InjectionController.buildGhostModeJS(
|
||||
typingIndicator: false,
|
||||
seenStatus: false,
|
||||
stories: true,
|
||||
dmPhotos: false,
|
||||
);
|
||||
expect(js, contains('/live/'));
|
||||
});
|
||||
|
||||
test('generated JS contains BLOCKED array and shouldBlock function', () {
|
||||
final js = InjectionController.buildGhostModeJS(
|
||||
typingIndicator: false,
|
||||
seenStatus: true,
|
||||
stories: false,
|
||||
dmPhotos: false,
|
||||
);
|
||||
expect(js, contains('BLOCKED'));
|
||||
expect(js, contains('shouldBlock'));
|
||||
});
|
||||
|
||||
test('generated JS wraps XHR and fetch', () {
|
||||
final js = InjectionController.buildGhostModeJS(
|
||||
typingIndicator: true,
|
||||
seenStatus: true,
|
||||
stories: true,
|
||||
dmPhotos: true,
|
||||
);
|
||||
expect(js, contains('window.fetch'));
|
||||
expect(js, contains('XMLHttpRequest.prototype.open'));
|
||||
expect(js, contains('XMLHttpRequest.prototype.send'));
|
||||
});
|
||||
|
||||
test('WS patch is included when typingIndicator=true', () {
|
||||
final js = InjectionController.buildGhostModeJS(
|
||||
typingIndicator: true,
|
||||
seenStatus: false,
|
||||
stories: false,
|
||||
dmPhotos: false,
|
||||
);
|
||||
expect(js, contains('WebSocket'));
|
||||
});
|
||||
|
||||
test('WS patch is NOT included when typingIndicator=false', () {
|
||||
final js = InjectionController.buildGhostModeJS(
|
||||
typingIndicator: false,
|
||||
seenStatus: true,
|
||||
stories: false,
|
||||
dmPhotos: false,
|
||||
);
|
||||
// WS_KEYS will be empty array; the `if (WS_KEYS.length > 0)` guard
|
||||
// prevents the WS override from running — but the string may still be present.
|
||||
// At minimum, WS_KEYS should be empty in the output.
|
||||
expect(js, contains('WS_KEYS = []'));
|
||||
});
|
||||
});
|
||||
|
||||
// ── buildSessionStateJS ──────────────────────────────────────────────────
|
||||
|
||||
group('InjectionController.buildSessionStateJS', () {
|
||||
test('returns true assignment when active', () {
|
||||
expect(
|
||||
InjectionController.buildSessionStateJS(true),
|
||||
contains('__focusgramSessionActive = true'),
|
||||
);
|
||||
});
|
||||
|
||||
test('returns false assignment when inactive', () {
|
||||
expect(
|
||||
InjectionController.buildSessionStateJS(false),
|
||||
contains('__focusgramSessionActive = false'),
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
// ── softNavigateJS ───────────────────────────────────────────────────────
|
||||
|
||||
group('InjectionController.softNavigateJS', () {
|
||||
test('contains the target path', () {
|
||||
final js = InjectionController.softNavigateJS('/direct/inbox/');
|
||||
expect(js, contains('/direct/inbox/'));
|
||||
});
|
||||
|
||||
test('contains location.href assignment', () {
|
||||
final js = InjectionController.softNavigateJS('/explore/');
|
||||
expect(js, contains('location.href'));
|
||||
});
|
||||
});
|
||||
|
||||
// ── buildInjectionJS ─────────────────────────────────────────────────────
|
||||
|
||||
group('InjectionController.buildInjectionJS', () {
|
||||
InjectionController.buildInjectionJS; // reference check
|
||||
|
||||
test('contains session state flag', () {
|
||||
final js = _buildFull();
|
||||
expect(js, contains('__focusgramSessionActive'));
|
||||
});
|
||||
|
||||
test('contains path tracker when assembled', () {
|
||||
final js = _buildFull();
|
||||
expect(js, contains('fgTrackPath'));
|
||||
});
|
||||
|
||||
test('includes reels block JS when session is not active', () {
|
||||
final js = InjectionController.buildInjectionJS(
|
||||
sessionActive: false,
|
||||
blurExplore: false,
|
||||
blurReels: false,
|
||||
ghostTyping: false,
|
||||
ghostSeen: false,
|
||||
ghostStories: false,
|
||||
ghostDmPhotos: false,
|
||||
enableTextSelection: false,
|
||||
);
|
||||
expect(js, contains('fgReelsBlock'));
|
||||
});
|
||||
|
||||
test('does NOT include reels block JS when session is active', () {
|
||||
final js = InjectionController.buildInjectionJS(
|
||||
sessionActive: true,
|
||||
blurExplore: false,
|
||||
blurReels: false,
|
||||
ghostTyping: false,
|
||||
ghostSeen: false,
|
||||
ghostStories: false,
|
||||
ghostDmPhotos: false,
|
||||
enableTextSelection: false,
|
||||
);
|
||||
expect(js, isNot(contains('fgReelsBlock')));
|
||||
});
|
||||
|
||||
test('always includes link sanitizer', () {
|
||||
final js = InjectionController.buildInjectionJS(
|
||||
sessionActive: false,
|
||||
blurExplore: false,
|
||||
blurReels: false,
|
||||
ghostTyping: false,
|
||||
ghostSeen: false,
|
||||
ghostStories: false,
|
||||
ghostDmPhotos: false,
|
||||
enableTextSelection: false,
|
||||
);
|
||||
// linkSanitizationJS is now always injected (not togglable)
|
||||
expect(js, contains('fgSanitize'));
|
||||
});
|
||||
|
||||
test('returns non-empty string in all cases', () {
|
||||
expect(_buildFull().trim(), isNotEmpty);
|
||||
});
|
||||
});
|
||||
|
||||
// ── iOSUserAgent sanity ──────────────────────────────────────────────────
|
||||
|
||||
group('InjectionController.iOSUserAgent', () {
|
||||
test('contains iPhone identifier', () {
|
||||
expect(InjectionController.iOSUserAgent, contains('iPhone'));
|
||||
});
|
||||
|
||||
test('contains FBAN (Instagram app identifier)', () {
|
||||
expect(InjectionController.iOSUserAgent, contains('FBAN'));
|
||||
});
|
||||
|
||||
test('is non-empty', () {
|
||||
expect(InjectionController.iOSUserAgent, isNotEmpty);
|
||||
});
|
||||
});
|
||||
|
||||
// ── notificationBridgeJS ─────────────────────────────────────────────────
|
||||
|
||||
group('InjectionController.notificationBridgeJS', () {
|
||||
test('contains Notification bridge guard', () {
|
||||
expect(
|
||||
InjectionController.notificationBridgeJS,
|
||||
contains('fgNotifBridged'),
|
||||
);
|
||||
});
|
||||
|
||||
test('patches window.Notification', () {
|
||||
expect(
|
||||
InjectionController.notificationBridgeJS,
|
||||
contains('window.Notification'),
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
// ── linkSanitizationJS ───────────────────────────────────────────────────
|
||||
|
||||
group('InjectionController.linkSanitizationJS', () {
|
||||
test('strips igsh param', () {
|
||||
expect(InjectionController.linkSanitizationJS, contains('igsh'));
|
||||
});
|
||||
|
||||
test('strips utm params', () {
|
||||
expect(InjectionController.linkSanitizationJS, contains('utm_source'));
|
||||
});
|
||||
|
||||
test('strips fbclid', () {
|
||||
expect(InjectionController.linkSanitizationJS, contains('fbclid'));
|
||||
});
|
||||
|
||||
test('patches navigator.share', () {
|
||||
expect(
|
||||
InjectionController.linkSanitizationJS,
|
||||
contains('navigator.share'),
|
||||
);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/// Helper to create a fully-featured injection JS for common assertions.
|
||||
String _buildFull() => InjectionController.buildInjectionJS(
|
||||
sessionActive: false,
|
||||
blurExplore: true,
|
||||
blurReels: true,
|
||||
ghostTyping: true,
|
||||
ghostSeen: true,
|
||||
ghostStories: true,
|
||||
ghostDmPhotos: true,
|
||||
enableTextSelection: false,
|
||||
);
|
||||
@@ -0,0 +1,193 @@
|
||||
// test/services/navigation_guard_test.dart
|
||||
//
|
||||
// Tests for NavigationGuard — the URL allow/block logic.
|
||||
//
|
||||
// Run with: flutter test test/services/navigation_guard_test.dart
|
||||
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:focusgram/services/navigation_guard.dart';
|
||||
|
||||
void main() {
|
||||
group('NavigationGuard.evaluate', () {
|
||||
// ── Instagram domain — allowed ──────────────────────────────────────────
|
||||
|
||||
test('allows root instagram.com', () {
|
||||
final d = NavigationGuard.evaluate(url: 'https://www.instagram.com/');
|
||||
expect(d.blocked, isFalse);
|
||||
});
|
||||
|
||||
test('allows profile pages', () {
|
||||
final d = NavigationGuard.evaluate(
|
||||
url: 'https://www.instagram.com/someuser/',
|
||||
);
|
||||
expect(d.blocked, isFalse);
|
||||
});
|
||||
|
||||
test('allows DM inbox', () {
|
||||
final d = NavigationGuard.evaluate(
|
||||
url: 'https://www.instagram.com/direct/inbox/',
|
||||
);
|
||||
expect(d.blocked, isFalse);
|
||||
});
|
||||
|
||||
test('allows Explore page', () {
|
||||
final d = NavigationGuard.evaluate(
|
||||
url: 'https://www.instagram.com/explore/',
|
||||
);
|
||||
expect(d.blocked, isFalse);
|
||||
});
|
||||
|
||||
test('allows instagram.com without www', () {
|
||||
final d = NavigationGuard.evaluate(
|
||||
url: 'https://instagram.com/accounts/login/',
|
||||
);
|
||||
expect(d.blocked, isFalse);
|
||||
});
|
||||
|
||||
test('allows a specific reel URL from a DM share', () {
|
||||
final d = NavigationGuard.evaluate(
|
||||
url: 'https://www.instagram.com/reel/ABC123xyz/',
|
||||
);
|
||||
expect(d.blocked, isFalse);
|
||||
});
|
||||
|
||||
test('allows login page', () {
|
||||
final d = NavigationGuard.evaluate(
|
||||
url: 'https://www.instagram.com/accounts/login/',
|
||||
);
|
||||
expect(d.blocked, isFalse);
|
||||
});
|
||||
|
||||
// ── Reels FEED tab — blocked ────────────────────────────────────────────
|
||||
|
||||
test('blocks the reels feed tab /reels/', () {
|
||||
final d = NavigationGuard.evaluate(
|
||||
url: 'https://www.instagram.com/reels/',
|
||||
);
|
||||
expect(d.blocked, isTrue);
|
||||
expect(d.reason, isNotNull);
|
||||
});
|
||||
|
||||
test('blocks the reels feed tab /reels (no trailing slash)', () {
|
||||
final d = NavigationGuard.evaluate(
|
||||
url: 'https://www.instagram.com/reels',
|
||||
);
|
||||
expect(d.blocked, isTrue);
|
||||
});
|
||||
|
||||
test('blocks the reels feed with our FocusGram query param', () {
|
||||
// NavigationDelegate fires this URL from _strictReelsBlockJS
|
||||
final d = NavigationGuard.evaluate(
|
||||
url: 'https://www.instagram.com/reels/?fg=blocked',
|
||||
);
|
||||
// NOTE: The guard blocks /reels/ root; query params don't change outcome
|
||||
// This is expected to be blocked since it matches _reelsFeedRegex
|
||||
expect(d.blocked, isTrue);
|
||||
});
|
||||
|
||||
// ── External domains — blocked ──────────────────────────────────────────
|
||||
|
||||
test('blocks external HTTP domains', () {
|
||||
final d = NavigationGuard.evaluate(url: 'https://evil.com/phish');
|
||||
expect(d.blocked, isTrue);
|
||||
expect(d.reason, contains('External domain'));
|
||||
});
|
||||
|
||||
test('blocks Facebook redirects', () {
|
||||
final d = NavigationGuard.evaluate(
|
||||
url: 'https://facebook.com/redirect?url=...',
|
||||
);
|
||||
expect(d.blocked, isTrue);
|
||||
});
|
||||
|
||||
test('blocks l.instagram.com tracking redirect', () {
|
||||
final d = NavigationGuard.evaluate(
|
||||
url: 'https://l.instagram.com/?u=https%3A%2F%2Fexample.com',
|
||||
);
|
||||
// l.instagram.com is not in _allowedHosts → blocked
|
||||
expect(d.blocked, isTrue);
|
||||
});
|
||||
|
||||
// ── Non-HTTP schemes — allowed ──────────────────────────────────────────
|
||||
|
||||
test('allows about:blank', () {
|
||||
final d = NavigationGuard.evaluate(url: 'about:blank');
|
||||
expect(d.blocked, isFalse);
|
||||
});
|
||||
|
||||
test('allows data: URIs', () {
|
||||
final d = NavigationGuard.evaluate(url: 'data:text/html,hello');
|
||||
expect(d.blocked, isFalse);
|
||||
});
|
||||
|
||||
// ── Invalid URL — safe fallback ─────────────────────────────────────────
|
||||
|
||||
test('does not throw on empty string — returns not blocked', () {
|
||||
final d = NavigationGuard.evaluate(url: '');
|
||||
expect(d.blocked, isFalse);
|
||||
});
|
||||
|
||||
test('does not throw on malformed URL', () {
|
||||
final d = NavigationGuard.evaluate(url: ':::bad:::');
|
||||
expect(d.blocked, isFalse);
|
||||
});
|
||||
});
|
||||
|
||||
group('NavigationGuard.isSpecificReel', () {
|
||||
test('returns true for a real reel URL', () {
|
||||
expect(
|
||||
NavigationGuard.isSpecificReel(
|
||||
'https://www.instagram.com/reel/ABC123/',
|
||||
),
|
||||
isTrue,
|
||||
);
|
||||
});
|
||||
|
||||
test('returns true for reel URL without trailing slash', () {
|
||||
expect(
|
||||
NavigationGuard.isSpecificReel('https://www.instagram.com/reel/XYZ'),
|
||||
isTrue,
|
||||
);
|
||||
});
|
||||
|
||||
test('returns false for the reels FEED root', () {
|
||||
expect(
|
||||
NavigationGuard.isSpecificReel('https://www.instagram.com/reels/'),
|
||||
isFalse,
|
||||
);
|
||||
});
|
||||
|
||||
test('returns false for profile URL', () {
|
||||
expect(
|
||||
NavigationGuard.isSpecificReel('https://www.instagram.com/someuser/'),
|
||||
isFalse,
|
||||
);
|
||||
});
|
||||
|
||||
test('returns false for DM inbox', () {
|
||||
expect(
|
||||
NavigationGuard.isSpecificReel(
|
||||
'https://www.instagram.com/direct/inbox/',
|
||||
),
|
||||
isFalse,
|
||||
);
|
||||
});
|
||||
|
||||
test('returns false for empty string', () {
|
||||
expect(NavigationGuard.isSpecificReel(''), isFalse);
|
||||
});
|
||||
});
|
||||
|
||||
group('BlockDecision', () {
|
||||
test('const constructor fields are accessible', () {
|
||||
const d = BlockDecision(blocked: true, reason: 'test');
|
||||
expect(d.blocked, isTrue);
|
||||
expect(d.reason, 'test');
|
||||
});
|
||||
|
||||
test('reason can be null', () {
|
||||
const d = BlockDecision(blocked: false, reason: null);
|
||||
expect(d.reason, isNull);
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,293 @@
|
||||
// test/services/session_manager_test.dart
|
||||
//
|
||||
// Tests for SessionManager — reel session logic, daily quotas, cooldowns,
|
||||
// app session tracking, and scheduled blocking.
|
||||
//
|
||||
// SessionManager uses SharedPreferences and Timer internally.
|
||||
// We use SharedPreferences.setMockInitialValues({}) for isolation.
|
||||
// Timer-based tests use FakeAsync where needed.
|
||||
//
|
||||
// Run with: flutter test test/services/session_manager_test.dart
|
||||
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import 'package:focusgram/services/session_manager.dart';
|
||||
|
||||
// Helper: initialise a SessionManager with a clean SharedPreferences slate.
|
||||
Future<SessionManager> _freshManager() async {
|
||||
SharedPreferences.setMockInitialValues({});
|
||||
final sm = SessionManager();
|
||||
await sm.init();
|
||||
return sm;
|
||||
}
|
||||
|
||||
void main() {
|
||||
// ── Initial state ────────────────────────────────────────────────────────
|
||||
|
||||
group('SessionManager — initial state', () {
|
||||
test('no reel session active on first init', () async {
|
||||
final sm = await _freshManager();
|
||||
expect(sm.isSessionActive, isFalse);
|
||||
});
|
||||
|
||||
test('remainingSessionSeconds is 0 when no session', () async {
|
||||
final sm = await _freshManager();
|
||||
expect(sm.remainingSessionSeconds, 0);
|
||||
});
|
||||
|
||||
test('dailyUsedSeconds starts at 0', () async {
|
||||
final sm = await _freshManager();
|
||||
expect(sm.dailyUsedSeconds, 0);
|
||||
});
|
||||
|
||||
test('dailyRemainingSeconds matches default limit', () async {
|
||||
final sm = await _freshManager();
|
||||
expect(sm.dailyRemainingSeconds, sm.dailyLimitSeconds);
|
||||
});
|
||||
|
||||
test('isDailyLimitExhausted is false initially', () async {
|
||||
final sm = await _freshManager();
|
||||
expect(sm.isDailyLimitExhausted, isFalse);
|
||||
});
|
||||
|
||||
test('isCooldownActive is false initially', () async {
|
||||
final sm = await _freshManager();
|
||||
expect(sm.isCooldownActive, isFalse);
|
||||
});
|
||||
|
||||
test('cooldownRemainingSeconds is 0 when no cooldown', () async {
|
||||
final sm = await _freshManager();
|
||||
expect(sm.cooldownRemainingSeconds, 0);
|
||||
});
|
||||
|
||||
test('daily open count is incremented on init', () async {
|
||||
final sm = await _freshManager();
|
||||
// init() calls _incrementOpenCount once
|
||||
expect(sm.dailyOpenCount, 1);
|
||||
});
|
||||
});
|
||||
|
||||
// ── Reel session — startSession ──────────────────────────────────────────
|
||||
|
||||
group('SessionManager.startSession', () {
|
||||
test('returns true and activates session within daily quota', () async {
|
||||
final sm = await _freshManager();
|
||||
final ok = sm.startSession(5);
|
||||
expect(ok, isTrue);
|
||||
expect(sm.isSessionActive, isTrue);
|
||||
});
|
||||
|
||||
test('session expires after requested minutes (approx)', () async {
|
||||
final sm = await _freshManager();
|
||||
sm.startSession(5);
|
||||
// Remaining should be <= 5 min = 300 s
|
||||
expect(sm.remainingSessionSeconds, lessThanOrEqualTo(300));
|
||||
expect(sm.remainingSessionSeconds, greaterThan(290));
|
||||
});
|
||||
|
||||
test('returns false when daily limit is exhausted', () async {
|
||||
SharedPreferences.setMockInitialValues({
|
||||
'sessn_daily_limit_sec': 300, // 5 min daily limit
|
||||
'sessn_daily_used_sec': 300, // already used all of it
|
||||
'sessn_daily_date': _today(),
|
||||
});
|
||||
final sm = SessionManager();
|
||||
await sm.init();
|
||||
final ok = sm.startSession(5);
|
||||
expect(ok, isFalse);
|
||||
expect(sm.isSessionActive, isFalse);
|
||||
});
|
||||
|
||||
test('returns false during cooldown', () async {
|
||||
// Last session ended 5 minutes ago; cooldown is 15 min
|
||||
final lastEnd = DateTime.now().subtract(const Duration(minutes: 5));
|
||||
SharedPreferences.setMockInitialValues({
|
||||
'sessn_last_end_ts': lastEnd.millisecondsSinceEpoch,
|
||||
'sessn_cooldown_sec': 900, // 15 min cooldown
|
||||
'sessn_daily_date': _today(),
|
||||
});
|
||||
final sm = SessionManager();
|
||||
await sm.init();
|
||||
expect(sm.isCooldownActive, isTrue);
|
||||
final ok = sm.startSession(5);
|
||||
expect(ok, isFalse);
|
||||
});
|
||||
|
||||
test('notifies listeners when session starts', () async {
|
||||
final sm = await _freshManager();
|
||||
bool notified = false;
|
||||
sm.addListener(() => notified = true);
|
||||
sm.startSession(5);
|
||||
expect(notified, isTrue);
|
||||
});
|
||||
});
|
||||
|
||||
// ── Reel session — endSession ────────────────────────────────────────────
|
||||
|
||||
group('SessionManager.endSession', () {
|
||||
test('deactivates an active session', () async {
|
||||
final sm = await _freshManager();
|
||||
sm.startSession(5);
|
||||
expect(sm.isSessionActive, isTrue);
|
||||
sm.endSession();
|
||||
expect(sm.isSessionActive, isFalse);
|
||||
});
|
||||
|
||||
test('remainingSessionSeconds becomes 0 after end', () async {
|
||||
final sm = await _freshManager();
|
||||
sm.startSession(5);
|
||||
sm.endSession();
|
||||
expect(sm.remainingSessionSeconds, 0);
|
||||
});
|
||||
|
||||
test('cooldown becomes active after ending a session', () async {
|
||||
final sm = await _freshManager();
|
||||
sm.startSession(5);
|
||||
sm.endSession();
|
||||
// Only active if cooldownSeconds > 0
|
||||
if (sm.cooldownSeconds > 0) {
|
||||
expect(sm.isCooldownActive, isTrue);
|
||||
}
|
||||
});
|
||||
|
||||
test('notifies listeners on end', () async {
|
||||
final sm = await _freshManager();
|
||||
sm.startSession(5);
|
||||
bool notified = false;
|
||||
sm.addListener(() => notified = true);
|
||||
sm.endSession();
|
||||
expect(notified, isTrue);
|
||||
});
|
||||
});
|
||||
|
||||
// ── Daily quota ──────────────────────────────────────────────────────────
|
||||
|
||||
group('SessionManager — daily quota', () {
|
||||
test('dailyRemainingSeconds is capped at 0 when exhausted', () async {
|
||||
SharedPreferences.setMockInitialValues({
|
||||
'sessn_daily_limit_sec': 300,
|
||||
'sessn_daily_used_sec': 400, // over limit
|
||||
'sessn_daily_date': _today(),
|
||||
});
|
||||
final sm = SessionManager();
|
||||
await sm.init();
|
||||
expect(sm.dailyRemainingSeconds, 0);
|
||||
expect(sm.isDailyLimitExhausted, isTrue);
|
||||
});
|
||||
|
||||
test('dailyRemainingSeconds decrements correctly', () async {
|
||||
SharedPreferences.setMockInitialValues({
|
||||
'sessn_daily_limit_sec': 600,
|
||||
'sessn_daily_used_sec': 100,
|
||||
'sessn_daily_date': _today(),
|
||||
});
|
||||
final sm = SessionManager();
|
||||
await sm.init();
|
||||
expect(sm.dailyRemainingSeconds, 500);
|
||||
});
|
||||
});
|
||||
|
||||
// ── App session ──────────────────────────────────────────────────────────
|
||||
|
||||
group('SessionManager — app session', () {
|
||||
test('app session is active when end is in the future', () async {
|
||||
final future = DateTime.now().add(const Duration(minutes: 30));
|
||||
SharedPreferences.setMockInitialValues({
|
||||
'app_sess_end_ts': future.millisecondsSinceEpoch,
|
||||
'sessn_daily_date': _today(),
|
||||
});
|
||||
final sm = SessionManager();
|
||||
await sm.init();
|
||||
expect(sm.isAppSessionActive, isTrue);
|
||||
});
|
||||
|
||||
test('app session is NOT active when end is in the past', () async {
|
||||
final past = DateTime.now().subtract(const Duration(minutes: 10));
|
||||
SharedPreferences.setMockInitialValues({
|
||||
'app_sess_end_ts': past.millisecondsSinceEpoch,
|
||||
'sessn_daily_date': _today(),
|
||||
});
|
||||
final sm = SessionManager();
|
||||
await sm.init();
|
||||
expect(sm.isAppSessionActive, isFalse);
|
||||
});
|
||||
|
||||
test('appSessionRemainingSeconds is > 0 for a future session', () async {
|
||||
final future = DateTime.now().add(const Duration(minutes: 30));
|
||||
SharedPreferences.setMockInitialValues({
|
||||
'app_sess_end_ts': future.millisecondsSinceEpoch,
|
||||
'sessn_daily_date': _today(),
|
||||
});
|
||||
final sm = SessionManager();
|
||||
await sm.init();
|
||||
expect(sm.appSessionRemainingSeconds, greaterThan(0));
|
||||
});
|
||||
|
||||
test('canExtendAppSession is true by default', () async {
|
||||
final sm = await _freshManager();
|
||||
expect(sm.canExtendAppSession, isTrue);
|
||||
});
|
||||
|
||||
test('canExtendAppSession is false when extension used', () async {
|
||||
SharedPreferences.setMockInitialValues({
|
||||
'app_sess_ext_used': true,
|
||||
'sessn_daily_date': _today(),
|
||||
});
|
||||
final sm = SessionManager();
|
||||
await sm.init();
|
||||
expect(sm.canExtendAppSession, isFalse);
|
||||
});
|
||||
});
|
||||
|
||||
// ── Scheduled blocking ───────────────────────────────────────────────────
|
||||
|
||||
group('SessionManager — scheduled blocking', () {
|
||||
test('isScheduledBlockActive is false when schedule disabled', () async {
|
||||
final sm = await _freshManager();
|
||||
expect(sm.scheduleEnabled, isFalse);
|
||||
expect(sm.isScheduledBlockActive, isFalse);
|
||||
});
|
||||
|
||||
test('simple daytime range (9:00–17:00) blocks at noon', () async {
|
||||
final sm = await _freshManager();
|
||||
// We can't control DateTime.now() but we CAN test the logic
|
||||
// by verifying the method doesn't throw and returns a bool.
|
||||
expect(sm.isScheduledBlockActive, isA<bool>());
|
||||
});
|
||||
});
|
||||
|
||||
// ── setAppForeground ─────────────────────────────────────────────────────
|
||||
|
||||
group('SessionManager.setAppForeground', () {
|
||||
test('does nothing when value is unchanged', () async {
|
||||
final sm = await _freshManager();
|
||||
bool notified = false;
|
||||
sm.addListener(() => notified = true);
|
||||
sm.setAppForeground(true); // already true by default (in foreground)
|
||||
expect(notified, isFalse);
|
||||
});
|
||||
|
||||
test('notifies when transitioning to background', () async {
|
||||
final sm = await _freshManager();
|
||||
bool notified = false;
|
||||
sm.addListener(() => notified = true);
|
||||
sm.setAppForeground(false);
|
||||
expect(notified, isTrue);
|
||||
});
|
||||
|
||||
test('notifies when returning to foreground', () async {
|
||||
final sm = await _freshManager();
|
||||
sm.setAppForeground(false); // go to background first
|
||||
bool notified = false;
|
||||
sm.addListener(() => notified = true);
|
||||
sm.setAppForeground(true);
|
||||
expect(notified, isTrue);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/// Returns today's date formatted as 'yyyy-MM-dd' (same format as SessionManager).
|
||||
String _today() {
|
||||
final now = DateTime.now();
|
||||
return '${now.year}-${now.month.toString().padLeft(2, '0')}-${now.day.toString().padLeft(2, '0')}';
|
||||
}
|
||||
@@ -0,0 +1,250 @@
|
||||
// test/services/settings_service_test.dart
|
||||
//
|
||||
// Tests for SettingsService — default values, setters, tab management,
|
||||
// and the legacy GhostMode key migration.
|
||||
//
|
||||
// Note: SettingsService requires SharedPreferences. We use
|
||||
// SharedPreferences.setMockInitialValues({}) to avoid platform channel calls.
|
||||
//
|
||||
// Run with: flutter test test/services/settings_service_test.dart
|
||||
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import 'package:focusgram/services/settings_service.dart';
|
||||
|
||||
/// Helper: create an initialised SettingsService with a clean prefs slate.
|
||||
Future<SettingsService> makeService() async {
|
||||
SharedPreferences.setMockInitialValues({});
|
||||
final svc = SettingsService();
|
||||
await svc.init();
|
||||
return svc;
|
||||
}
|
||||
|
||||
void main() {
|
||||
setUp(() {
|
||||
SharedPreferences.setMockInitialValues({});
|
||||
});
|
||||
|
||||
// ── Default values ──────────────────────────────────────────────────────
|
||||
|
||||
group('SettingsService — defaults', () {
|
||||
test('blurExplore defaults to true', () async {
|
||||
expect((await makeService()).blurExplore, isTrue);
|
||||
});
|
||||
|
||||
test('blurReels defaults to false', () async {
|
||||
expect((await makeService()).blurReels, isFalse);
|
||||
});
|
||||
|
||||
test('requireLongPress defaults to true', () async {
|
||||
expect((await makeService()).requireLongPress, isTrue);
|
||||
});
|
||||
|
||||
test('showBreathGate defaults to true', () async {
|
||||
expect((await makeService()).showBreathGate, isTrue);
|
||||
});
|
||||
|
||||
test('requireWordChallenge defaults to true', () async {
|
||||
expect((await makeService()).requireWordChallenge, isTrue);
|
||||
});
|
||||
|
||||
test('enableTextSelection defaults to false', () async {
|
||||
expect((await makeService()).enableTextSelection, isFalse);
|
||||
});
|
||||
|
||||
test('ghostTyping defaults to true', () async {
|
||||
expect((await makeService()).ghostTyping, isTrue);
|
||||
});
|
||||
|
||||
test('ghostSeen defaults to true', () async {
|
||||
expect((await makeService()).ghostSeen, isTrue);
|
||||
});
|
||||
|
||||
test('ghostStories defaults to true', () async {
|
||||
expect((await makeService()).ghostStories, isTrue);
|
||||
});
|
||||
|
||||
test('ghostDmPhotos defaults to true', () async {
|
||||
expect((await makeService()).ghostDmPhotos, isTrue);
|
||||
});
|
||||
|
||||
test('sanitizeLinks defaults to true', () async {
|
||||
expect((await makeService()).sanitizeLinks, isTrue);
|
||||
});
|
||||
|
||||
test('isFirstRun defaults to true', () async {
|
||||
expect((await makeService()).isFirstRun, isTrue);
|
||||
});
|
||||
|
||||
test(
|
||||
'anyGhostModeEnabled is true when all ghost settings are true',
|
||||
() async {
|
||||
expect((await makeService()).anyGhostModeEnabled, isTrue);
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
// ── Setters ─────────────────────────────────────────────────────────────
|
||||
|
||||
group('SettingsService — setters persist and notify', () {
|
||||
test('setBlurExplore changes value and notifies', () async {
|
||||
final svc = await makeService();
|
||||
bool notified = false;
|
||||
svc.addListener(() => notified = true);
|
||||
await svc.setBlurExplore(false);
|
||||
expect(svc.blurExplore, isFalse);
|
||||
expect(notified, isTrue);
|
||||
});
|
||||
|
||||
test('setBlurReels persists', () async {
|
||||
final svc = await makeService();
|
||||
await svc.setBlurReels(true);
|
||||
expect(svc.blurReels, isTrue);
|
||||
});
|
||||
|
||||
test('setRequireLongPress persists', () async {
|
||||
final svc = await makeService();
|
||||
await svc.setRequireLongPress(false);
|
||||
expect(svc.requireLongPress, isFalse);
|
||||
});
|
||||
|
||||
test('setGhostTyping turns off ghost typing', () async {
|
||||
final svc = await makeService();
|
||||
await svc.setGhostTyping(false);
|
||||
expect(svc.ghostTyping, isFalse);
|
||||
});
|
||||
|
||||
test('setGhostSeen turns off ghost seen', () async {
|
||||
final svc = await makeService();
|
||||
await svc.setGhostSeen(false);
|
||||
expect(svc.ghostSeen, isFalse);
|
||||
});
|
||||
|
||||
test('setGhostStories turns off ghost stories', () async {
|
||||
final svc = await makeService();
|
||||
await svc.setGhostStories(false);
|
||||
expect(svc.ghostStories, isFalse);
|
||||
});
|
||||
|
||||
test('setGhostDmPhotos turns off ghost dm photos', () async {
|
||||
final svc = await makeService();
|
||||
await svc.setGhostDmPhotos(false);
|
||||
expect(svc.ghostDmPhotos, isFalse);
|
||||
});
|
||||
|
||||
test('setSanitizeLinks persists', () async {
|
||||
final svc = await makeService();
|
||||
await svc.setSanitizeLinks(false);
|
||||
expect(svc.sanitizeLinks, isFalse);
|
||||
});
|
||||
|
||||
test('setFirstRunCompleted sets isFirstRun to false', () async {
|
||||
final svc = await makeService();
|
||||
await svc.setFirstRunCompleted();
|
||||
expect(svc.isFirstRun, isFalse);
|
||||
});
|
||||
|
||||
test('setEnableTextSelection persists', () async {
|
||||
final svc = await makeService();
|
||||
await svc.setEnableTextSelection(true);
|
||||
expect(svc.enableTextSelection, isTrue);
|
||||
});
|
||||
});
|
||||
|
||||
// ── anyGhostModeEnabled ──────────────────────────────────────────────────
|
||||
|
||||
group('SettingsService.anyGhostModeEnabled', () {
|
||||
test('is false when all ghost flags are off', () async {
|
||||
final svc = await makeService();
|
||||
await svc.setGhostTyping(false);
|
||||
await svc.setGhostSeen(false);
|
||||
await svc.setGhostStories(false);
|
||||
await svc.setGhostDmPhotos(false);
|
||||
expect(svc.anyGhostModeEnabled, isFalse);
|
||||
});
|
||||
|
||||
test('is true when only one ghost flag is on', () async {
|
||||
final svc = await makeService();
|
||||
await svc.setGhostTyping(false);
|
||||
await svc.setGhostSeen(false);
|
||||
await svc.setGhostStories(false);
|
||||
await svc.setGhostDmPhotos(true); // only dmPhotos on
|
||||
expect(svc.anyGhostModeEnabled, isTrue);
|
||||
});
|
||||
});
|
||||
|
||||
// ── Tab management ───────────────────────────────────────────────────────
|
||||
|
||||
group('SettingsService — tab management', () {
|
||||
test('default tabs include Home, Reels, Messages, Profile', () async {
|
||||
final svc = await makeService();
|
||||
expect(
|
||||
svc.enabledTabs,
|
||||
containsAll(['Home', 'Reels', 'Messages', 'Profile']),
|
||||
);
|
||||
});
|
||||
|
||||
test('toggleTab removes an enabled tab', () async {
|
||||
final svc = await makeService();
|
||||
final before = List<String>.from(svc.enabledTabs);
|
||||
await svc.toggleTab('Reels');
|
||||
expect(svc.enabledTabs, isNot(contains('Reels')));
|
||||
expect(svc.enabledTabs.length, before.length - 1);
|
||||
});
|
||||
|
||||
test('toggleTab adds a tab back when toggled again', () async {
|
||||
final svc = await makeService();
|
||||
await svc.toggleTab('Reels');
|
||||
await svc.toggleTab('Reels');
|
||||
expect(svc.enabledTabs, contains('Reels'));
|
||||
});
|
||||
|
||||
test('toggleTab does not remove the last remaining tab', () async {
|
||||
final svc = await makeService();
|
||||
final tabs = List<String>.from(svc.enabledTabs);
|
||||
for (final t in tabs.sublist(0, tabs.length - 1)) {
|
||||
await svc.toggleTab(t);
|
||||
}
|
||||
final last = svc.enabledTabs.first;
|
||||
await svc.toggleTab(last); // try to remove the last one
|
||||
expect(svc.enabledTabs.length, 1); // still 1
|
||||
});
|
||||
|
||||
test('reorderTab moves item correctly — no tabs are lost', () async {
|
||||
final svc = await makeService();
|
||||
final original = List<String>.from(svc.enabledTabs);
|
||||
await svc.reorderTab(0, 1);
|
||||
expect(svc.enabledTabs.toSet(), original.toSet());
|
||||
});
|
||||
});
|
||||
|
||||
// ── Legacy Ghost Mode migration ──────────────────────────────────────────
|
||||
|
||||
group('SettingsService — legacy ghost mode migration', () {
|
||||
test(
|
||||
'migrates legacy ghost_mode=true to all four granular flags',
|
||||
() async {
|
||||
SharedPreferences.setMockInitialValues({'set_ghost_mode': true});
|
||||
final svc = SettingsService();
|
||||
await svc.init();
|
||||
expect(svc.ghostTyping, isTrue);
|
||||
expect(svc.ghostSeen, isTrue);
|
||||
expect(svc.ghostStories, isTrue);
|
||||
expect(svc.ghostDmPhotos, isTrue);
|
||||
},
|
||||
);
|
||||
|
||||
test(
|
||||
'migrates legacy ghost_mode=false to all four granular flags off',
|
||||
() async {
|
||||
SharedPreferences.setMockInitialValues({'set_ghost_mode': false});
|
||||
final svc = SettingsService();
|
||||
await svc.init();
|
||||
expect(svc.ghostTyping, isFalse);
|
||||
expect(svc.ghostSeen, isFalse);
|
||||
expect(svc.ghostStories, isFalse);
|
||||
expect(svc.ghostDmPhotos, isFalse);
|
||||
},
|
||||
);
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user