Merge branch 'master' into post-creation
This commit is contained in:
commit
4083742574
|
@ -0,0 +1,33 @@
|
|||
---
|
||||
name: "\U0001F41B Bug report"
|
||||
about: Create a report to help us improve
|
||||
title: ''
|
||||
labels: bug
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
### Device info
|
||||
|
||||
- OS: [eg. iOS/Android]
|
||||
- OS version: [eg. 10]
|
||||
- Device: [eg. OnePlus 6]
|
||||
|
||||
### Describe the bug
|
||||
A clear and concise description of what the bug is.
|
||||
|
||||
### Steps to reproduce
|
||||
|
||||
1. Go to '...'
|
||||
2. Click on '....'
|
||||
3. Scroll down to '....'
|
||||
4. See error
|
||||
|
||||
### Expected behavior
|
||||
A clear and concise description of what you expected to happen.
|
||||
|
||||
### Screenshots/Screencasts
|
||||
If applicable, add screenshots to help explain your problem.
|
||||
|
||||
### Additional context
|
||||
Add any other context about the problem here.
|
|
@ -0,0 +1,20 @@
|
|||
---
|
||||
name: "\U0001F680 Feature request"
|
||||
about: Suggest an idea for Lemmur
|
||||
title: ''
|
||||
labels: enhancement
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
### Is your feature request related to a problem? Please describe.
|
||||
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
||||
|
||||
### Describe the solution you'd like
|
||||
A clear and concise description of what you want to happen.
|
||||
|
||||
### Describe alternatives you've considered
|
||||
A clear and concise description of any alternative solutions or features you've considered.
|
||||
|
||||
### Additional context
|
||||
Add any other context or screenshots about the feature request here.
|
|
@ -0,0 +1,15 @@
|
|||
## Unreleased
|
||||
|
||||
First release of Lemmur the Lemmy mobile client!
|
||||
|
||||
Features include:
|
||||
|
||||
- Add multiple accounts/instances
|
||||
- Show instance
|
||||
- Show community
|
||||
- Show post
|
||||
- Show user profile
|
||||
- Comment
|
||||
- Comment/post actions: save/upvote/downvote
|
||||
- Light/dark/AMOLED themes
|
||||
- Follow/Unfollow communities
|
|
@ -0,0 +1,35 @@
|
|||
# Contributing
|
||||
|
||||
...is welcome!
|
||||
|
||||
## Issue tracking / Repository
|
||||
|
||||
From issues to wikis: everything is on [GitHub](https://github.com/krawieck/lemmur)
|
||||
|
||||
## Architecture
|
||||
|
||||
Lemmur is written in Dart using [Flutter](https://flutter.dev/docs). To communicate with Lemmy instances [lemmy_api_client](https://github.com/krawieck/lemmy_api_client) is used.
|
||||
|
||||
### State management
|
||||
|
||||
[MobX](https://github.com/mobxjs/mobx.dart) is used for global state management, [flutter_hooks](https://github.com/rrousselGit/flutter_hooks) is used for local (widget-level) state management. `StatefulWidget`s are avoided all together and any state logic reuse is moved to a [custom hook](./lib/hooks).
|
||||
|
||||
### Project structure
|
||||
|
||||
(relative to `lib/`)
|
||||
|
||||
- `hooks/`: reusable state hooks
|
||||
- `pages/`: fullscreen pages that you navigate to
|
||||
- `stores/`: MobX global stores
|
||||
- `util/`: utilities
|
||||
- `widgets/`: reusable widgets; building blocks for pages
|
||||
- `main.dart`: entrypoint of the app. Sets up the stores, initializes the themes, renders the first page
|
||||
|
||||
### Things to keep in mind
|
||||
|
||||
- Be aware that Lemmur supports arbitrary Lemmy instances, don't hardcode instance urls
|
||||
- Remember that a user is not obligated to be logged in, contributed widgets should handle this case
|
||||
|
||||
## Linting / Formatting
|
||||
|
||||
Everything is formatted with `dartfmt` (no flags) and linted with `dartanalyzer` ([see rules](analysis_options.yaml)). Both are enforced by the CI.
|
|
@ -0,0 +1,339 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Lesser General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
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
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
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
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the 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 a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE 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.
|
||||
|
||||
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
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
|
@ -0,0 +1,53 @@
|
|||
import 'dart:async';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_hooks/flutter_hooks.dart';
|
||||
|
||||
import 'ref.dart';
|
||||
|
||||
class Debounce {
|
||||
final bool loading;
|
||||
final void Function() callback;
|
||||
|
||||
void call() => callback();
|
||||
|
||||
// void dispose() {}
|
||||
|
||||
const Debounce({
|
||||
@required this.loading,
|
||||
@required this.callback,
|
||||
});
|
||||
}
|
||||
|
||||
/// will run `callback()` after debounce hook hasn't been called for the
|
||||
/// specified `delayDuration`
|
||||
Debounce useDebounce(
|
||||
Future<Null> Function() callback, [
|
||||
Duration delayDuration = const Duration(seconds: 1),
|
||||
]) {
|
||||
final loading = useState(false);
|
||||
final timerHandle = useRef<Timer>(null);
|
||||
|
||||
cancel() {
|
||||
timerHandle.current?.cancel();
|
||||
loading.value = false;
|
||||
}
|
||||
|
||||
useEffect(() => () => timerHandle.current?.cancel(), []);
|
||||
|
||||
start() {
|
||||
timerHandle.current = Timer(delayDuration, () async {
|
||||
loading.value = true;
|
||||
await callback();
|
||||
cancel();
|
||||
});
|
||||
}
|
||||
|
||||
return Debounce(
|
||||
loading: loading.value,
|
||||
callback: () {
|
||||
cancel();
|
||||
start();
|
||||
},
|
||||
);
|
||||
}
|
|
@ -0,0 +1,203 @@
|
|||
import 'package:cached_network_image/cached_network_image.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_hooks/flutter_hooks.dart';
|
||||
import 'package:lemmy_api_client/lemmy_api_client.dart';
|
||||
import 'package:url_launcher/url_launcher.dart' as ul;
|
||||
|
||||
import '../hooks/delayed_loading.dart';
|
||||
import '../hooks/stores.dart';
|
||||
import '../widgets/bottom_modal.dart';
|
||||
import '../widgets/fullscreenable_image.dart';
|
||||
import 'add_instance.dart';
|
||||
|
||||
class AddAccountPage extends HookWidget {
|
||||
final String instanceUrl;
|
||||
final GlobalKey<ScaffoldState> scaffoldKey = GlobalKey();
|
||||
|
||||
AddAccountPage({@required this.instanceUrl}) : assert(instanceUrl != null);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
|
||||
final usernameController = useTextEditingController();
|
||||
final passwordController = useTextEditingController();
|
||||
useValueListenable(usernameController);
|
||||
useValueListenable(passwordController);
|
||||
final accountsStore = useAccountsStore();
|
||||
|
||||
final loading = useDelayedLoading(Duration(milliseconds: 500));
|
||||
final selectedInstance = useState(instanceUrl);
|
||||
final icon = useState<String>(null);
|
||||
useEffect(() {
|
||||
LemmyApi(selectedInstance.value)
|
||||
.v1
|
||||
.getSite()
|
||||
.then((site) => icon.value = site.site.icon);
|
||||
return null;
|
||||
}, [selectedInstance.value]);
|
||||
|
||||
selectInstance() async {
|
||||
final val = await showModalBottomSheet<String>(
|
||||
backgroundColor: Colors.transparent,
|
||||
isScrollControlled: true,
|
||||
context: context,
|
||||
builder: (context) => BottomModal(
|
||||
title: 'select instance',
|
||||
child: Column(children: [
|
||||
for (final i in accountsStore.users.keys)
|
||||
RadioListTile<String>(
|
||||
value: i,
|
||||
groupValue: selectedInstance.value,
|
||||
onChanged: (val) {
|
||||
Navigator.of(context).pop(val);
|
||||
},
|
||||
title: Text(i),
|
||||
),
|
||||
ListTile(
|
||||
leading: Padding(
|
||||
padding: const EdgeInsets.all(8),
|
||||
child: Icon(Icons.add),
|
||||
),
|
||||
title: Text('Add instance'),
|
||||
onTap: () async {
|
||||
final val = await showCupertinoModalPopup<String>(
|
||||
context: context,
|
||||
builder: (context) => AddInstancePage(),
|
||||
);
|
||||
Navigator.of(context).pop(val);
|
||||
},
|
||||
),
|
||||
]),
|
||||
),
|
||||
);
|
||||
if (val != null) {
|
||||
selectedInstance.value = val;
|
||||
}
|
||||
}
|
||||
|
||||
handleOnAdd() async {
|
||||
try {
|
||||
loading.start();
|
||||
await accountsStore.addAccount(
|
||||
selectedInstance.value,
|
||||
usernameController.text,
|
||||
passwordController.text,
|
||||
);
|
||||
Navigator.of(context).pop();
|
||||
} on Exception catch (err) {
|
||||
scaffoldKey.currentState.showSnackBar(SnackBar(
|
||||
content: Text(err.toString()),
|
||||
));
|
||||
}
|
||||
loading.cancel();
|
||||
}
|
||||
|
||||
return Scaffold(
|
||||
key: scaffoldKey,
|
||||
appBar: AppBar(
|
||||
leading: CloseButton(),
|
||||
actionsIconTheme: theme.iconTheme,
|
||||
iconTheme: theme.iconTheme,
|
||||
textTheme: theme.textTheme,
|
||||
brightness: theme.brightness,
|
||||
centerTitle: true,
|
||||
title: Text('Add account'),
|
||||
backgroundColor: theme.canvasColor,
|
||||
shadowColor: Colors.transparent,
|
||||
),
|
||||
body: Padding(
|
||||
padding: const EdgeInsets.all(15),
|
||||
child: ListView(
|
||||
children: [
|
||||
if (icon.value == null)
|
||||
SizedBox(height: 150)
|
||||
else
|
||||
SizedBox(
|
||||
height: 150,
|
||||
child: FullscreenableImage(
|
||||
url: icon.value,
|
||||
child: CachedNetworkImage(
|
||||
imageUrl: icon.value,
|
||||
errorWidget: (_, __, ___) => Container(),
|
||||
),
|
||||
),
|
||||
),
|
||||
FlatButton(
|
||||
onPressed: selectInstance,
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Text(selectedInstance.value),
|
||||
Icon(Icons.arrow_drop_down),
|
||||
],
|
||||
),
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
),
|
||||
),
|
||||
// TODO: add support for password managers
|
||||
TextField(
|
||||
autofocus: true,
|
||||
controller: usernameController,
|
||||
decoration: InputDecoration(
|
||||
isDense: true,
|
||||
contentPadding:
|
||||
EdgeInsets.symmetric(horizontal: 10, vertical: 10),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
),
|
||||
labelText: 'Username or email',
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 5),
|
||||
TextField(
|
||||
controller: passwordController,
|
||||
obscureText: true,
|
||||
decoration: InputDecoration(
|
||||
isDense: true,
|
||||
contentPadding:
|
||||
EdgeInsets.symmetric(horizontal: 10, vertical: 10),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
),
|
||||
labelText: 'Password',
|
||||
),
|
||||
),
|
||||
RaisedButton(
|
||||
color: theme.accentColor,
|
||||
padding: EdgeInsets.all(0),
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
),
|
||||
child: !loading.loading
|
||||
? Text('Sign in')
|
||||
: SizedBox(
|
||||
width: 20,
|
||||
height: 20,
|
||||
child: CircularProgressIndicator(
|
||||
valueColor:
|
||||
AlwaysStoppedAnimation<Color>(theme.canvasColor),
|
||||
),
|
||||
),
|
||||
onPressed: usernameController.text.isEmpty ||
|
||||
passwordController.text.isEmpty
|
||||
? null
|
||||
: loading.pending ? () {} : handleOnAdd,
|
||||
),
|
||||
FlatButton(
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
),
|
||||
child: Text('Register'),
|
||||
onPressed: () {
|
||||
ul.launch('https://${selectedInstance.value}/login');
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
|
@ -0,0 +1,161 @@
|
|||
import 'package:cached_network_image/cached_network_image.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_hooks/flutter_hooks.dart';
|
||||
import 'package:lemmy_api_client/lemmy_api_client.dart';
|
||||
|
||||
import '../hooks/debounce.dart';
|
||||
import '../hooks/stores.dart';
|
||||
import '../widgets/fullscreenable_image.dart';
|
||||
|
||||
/// A page that let's user add a new instance. Pops a url of the added instance
|
||||
class AddInstancePage extends HookWidget {
|
||||
final GlobalKey<ScaffoldState> scaffoldKey = GlobalKey();
|
||||
|
||||
AddInstancePage();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final instanceController = useTextEditingController();
|
||||
useValueListenable(instanceController);
|
||||
final accountsStore = useAccountsStore();
|
||||
|
||||
final isSite = useState<bool>(null);
|
||||
final icon = useState<String>(null);
|
||||
final prevInput = usePrevious(instanceController.text);
|
||||
final debounce = useDebounce(() async {
|
||||
if (prevInput == instanceController.text) return;
|
||||
|
||||
final inst = _fixInstanceUrl(instanceController.text);
|
||||
if (inst.isEmpty) {
|
||||
isSite.value = null;
|
||||
return;
|
||||
}
|
||||
try {
|
||||
icon.value = (await LemmyApi(inst).v1.getSite()).site.icon;
|
||||
isSite.value = true;
|
||||
// ignore: avoid_catches_without_on_clauses
|
||||
} catch (e) {
|
||||
isSite.value = false;
|
||||
}
|
||||
});
|
||||
|
||||
useEffect(() {
|
||||
instanceController.addListener(debounce);
|
||||
|
||||
return () {
|
||||
instanceController.removeListener(debounce);
|
||||
};
|
||||
}, []);
|
||||
final inst = _fixInstanceUrl(instanceController.text);
|
||||
handleOnAdd() async {
|
||||
try {
|
||||
await accountsStore.addInstance(inst, assumeValid: true);
|
||||
Navigator.of(context).pop(inst);
|
||||
} on Exception catch (err) {
|
||||
scaffoldKey.currentState.showSnackBar(SnackBar(
|
||||
content: Text(err.toString()),
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
return Scaffold(
|
||||
key: scaffoldKey,
|
||||
appBar: AppBar(
|
||||
backgroundColor: theme.scaffoldBackgroundColor,
|
||||
brightness: theme.brightness,
|
||||
shadowColor: Colors.transparent,
|
||||
iconTheme: theme.iconTheme,
|
||||
centerTitle: true,
|
||||
leading: CloseButton(),
|
||||
actionsIconTheme: theme.iconTheme,
|
||||
textTheme: theme.textTheme,
|
||||
title: Text('Add instance'),
|
||||
),
|
||||
body: ListView(
|
||||
children: [
|
||||
if (isSite.value == true)
|
||||
SizedBox(
|
||||
height: 150,
|
||||
child: FullscreenableImage(
|
||||
child: CachedNetworkImage(
|
||||
imageUrl: icon.value,
|
||||
errorWidget: (_, __, ___) => Container(),
|
||||
),
|
||||
url: icon.value,
|
||||
))
|
||||
else if (isSite.value == false)
|
||||
SizedBox(
|
||||
height: 150,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Icon(Icons.close, color: Colors.red),
|
||||
Text('instance not found')
|
||||
],
|
||||
),
|
||||
)
|
||||
else
|
||||
SizedBox(height: 150),
|
||||
SizedBox(height: 15),
|
||||
SizedBox(
|
||||
height: 40,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 15),
|
||||
child: TextField(
|
||||
autofocus: true,
|
||||
controller: instanceController,
|
||||
autocorrect: false,
|
||||
decoration: InputDecoration(
|
||||
isDense: true,
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
),
|
||||
labelText: 'instance url',
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(height: 5),
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 15),
|
||||
child: SizedBox(
|
||||
height: 40,
|
||||
child: RaisedButton(
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
),
|
||||
color: theme.accentColor,
|
||||
child: !debounce.loading
|
||||
? Text('Add')
|
||||
: SizedBox(
|
||||
height: 20,
|
||||
width: 20,
|
||||
child: CircularProgressIndicator(
|
||||
valueColor:
|
||||
AlwaysStoppedAnimation<Color>(theme.canvasColor),
|
||||
),
|
||||
),
|
||||
onPressed: isSite.value == true ? handleOnAdd : null,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
String _fixInstanceUrl(String inst) {
|
||||
if (inst.startsWith('https://')) {
|
||||
inst = inst.substring(8);
|
||||
}
|
||||
|
||||
if (inst.startsWith('http://')) {
|
||||
inst = inst.substring(7);
|
||||
}
|
||||
|
||||
if (inst.endsWith('/')) inst = inst.substring(0, inst.length - 1);
|
||||
|
||||
return inst;
|
||||
}
|
|
@ -2,9 +2,13 @@ import 'package:flutter/cupertino.dart';
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_hooks/flutter_hooks.dart';
|
||||
import 'package:flutter_mobx/flutter_mobx.dart';
|
||||
import 'package:flutter_slidable/flutter_slidable.dart';
|
||||
import 'package:flutter_speed_dial/flutter_speed_dial.dart';
|
||||
|
||||
import '../hooks/stores.dart';
|
||||
import '../util/goto.dart';
|
||||
import 'add_account.dart';
|
||||
import 'add_instance.dart';
|
||||
|
||||
class SettingsPage extends StatelessWidget {
|
||||
@override
|
||||
|
@ -13,6 +17,7 @@ class SettingsPage extends StatelessWidget {
|
|||
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
brightness: theme.brightness,
|
||||
backgroundColor: theme.scaffoldBackgroundColor,
|
||||
shadowColor: Colors.transparent,
|
||||
iconTheme: theme.iconTheme,
|
||||
|
@ -51,6 +56,7 @@ class AppearanceConfigPage extends HookWidget {
|
|||
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
brightness: theme.brightness,
|
||||
backgroundColor: theme.scaffoldBackgroundColor,
|
||||
shadowColor: Colors.transparent,
|
||||
iconTheme: theme.iconTheme,
|
||||
|
@ -91,24 +97,88 @@ class AccountsConfigPage extends HookWidget {
|
|||
final theme = Theme.of(context);
|
||||
final accountsStore = useAccountsStore();
|
||||
|
||||
removeInstanceDialog(String instanceUrl) async {
|
||||
if (await showDialog<bool>(
|
||||
context: context,
|
||||
builder: (context) => AlertDialog(
|
||||
title: Text('Remove instance?'),
|
||||
content: Text('Are you sure you want to remove $instanceUrl?'),
|
||||
actions: [
|
||||
FlatButton(
|
||||
child: Text('no'),
|
||||
onPressed: () => Navigator.of(context).pop(false),
|
||||
),
|
||||
FlatButton(
|
||||
child: Text('yes'),
|
||||
onPressed: () => Navigator.of(context).pop(true),
|
||||
),
|
||||
],
|
||||
),
|
||||
) ??
|
||||
false) {
|
||||
accountsStore.removeInstance(instanceUrl);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> removeUserDialog(String instanceUrl, String username) async {
|
||||
if (await showDialog<bool>(
|
||||
context: context,
|
||||
builder: (context) => AlertDialog(
|
||||
title: Text('Remove user?'),
|
||||
content: Text(
|
||||
'Are you sure you want to remove $username@$instanceUrl?'),
|
||||
actions: [
|
||||
FlatButton(
|
||||
child: Text('no'),
|
||||
onPressed: () => Navigator.of(context).pop(false),
|
||||
),
|
||||
FlatButton(
|
||||
child: Text('yes'),
|
||||
onPressed: () => Navigator.of(context).pop(true),
|
||||
),
|
||||
],
|
||||
),
|
||||
) ??
|
||||
false) {
|
||||
accountsStore.removeAccount(instanceUrl, username);
|
||||
}
|
||||
}
|
||||
|
||||
return Scaffold(
|
||||
key: _scaffoldKey,
|
||||
appBar: AppBar(
|
||||
backgroundColor: theme.scaffoldBackgroundColor,
|
||||
brightness: theme.brightness,
|
||||
shadowColor: Colors.transparent,
|
||||
iconTheme: theme.iconTheme,
|
||||
title: Text('Accounts', style: theme.textTheme.headline6),
|
||||
centerTitle: true,
|
||||
),
|
||||
floatingActionButton: FloatingActionButton(
|
||||
onPressed: () {
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (_) =>
|
||||
_AccountsConfigAddInstanceDialog(scaffoldKey: _scaffoldKey),
|
||||
);
|
||||
},
|
||||
floatingActionButton: SpeedDial(
|
||||
animatedIcon: AnimatedIcons.menu_close, // TODO: change to + => x
|
||||
closeManually: false,
|
||||
curve: Curves.bounceIn,
|
||||
tooltip: 'Add account or instance',
|
||||
child: Icon(Icons.add),
|
||||
overlayColor: theme.canvasColor,
|
||||
children: [
|
||||
SpeedDialChild(
|
||||
child: Icon(Icons.person_add),
|
||||
label: 'Add account',
|
||||
labelBackgroundColor: theme.canvasColor,
|
||||
onTap: () => showCupertinoModalPopup(
|
||||
context: context,
|
||||
builder: (_) =>
|
||||
AddAccountPage(instanceUrl: accountsStore.users.keys.last)),
|
||||
),
|
||||
SpeedDialChild(
|
||||
child: Icon(Icons.dns),
|
||||
labelBackgroundColor: theme.canvasColor,
|
||||
label: 'Add instance',
|
||||
onTap: () => showCupertinoModalPopup(
|
||||
context: context, builder: (_) => AddInstancePage()),
|
||||
),
|
||||
],
|
||||
),
|
||||
body: Observer(
|
||||
builder: (ctx) {
|
||||
|
@ -116,38 +186,91 @@ class AccountsConfigPage extends HookWidget {
|
|||
|
||||
return ListView(
|
||||
children: [
|
||||
if (accountsStore.users.isEmpty)
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 100),
|
||||
child: FlatButton.icon(
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
),
|
||||
onPressed: () => showCupertinoModalPopup(
|
||||
context: context,
|
||||
builder: (_) => AddInstancePage(),
|
||||
),
|
||||
icon: Icon(Icons.add),
|
||||
label: Text('Add instance')),
|
||||
),
|
||||
],
|
||||
),
|
||||
for (final entry in accountsStore.users.entries) ...[
|
||||
_SectionHeading(entry.key),
|
||||
SizedBox(height: 40),
|
||||
Slidable(
|
||||
actionPane: SlidableBehindActionPane(),
|
||||
secondaryActions: [
|
||||
IconSlideAction(
|
||||
closeOnTap: true,
|
||||
onTap: () => removeInstanceDialog(entry.key),
|
||||
icon: Icons.delete_sweep,
|
||||
color: Colors.red,
|
||||
),
|
||||
],
|
||||
key: Key(entry.key),
|
||||
child: Container(
|
||||
color: theme.canvasColor,
|
||||
child: ListTile(
|
||||
dense: true,
|
||||
contentPadding: EdgeInsets.only(left: 0, top: 0),
|
||||
title: _SectionHeading(entry.key),
|
||||
),
|
||||
),
|
||||
),
|
||||
for (final username in entry.value.keys) ...[
|
||||
ListTile(
|
||||
trailing:
|
||||
username == accountsStore.defaultUserFor(entry.key).name
|
||||
Slidable(
|
||||
actionPane: SlidableBehindActionPane(),
|
||||
key: Key('$username@${entry.key}'),
|
||||
secondaryActions: [
|
||||
IconSlideAction(
|
||||
closeOnTap: true,
|
||||
onTap: () => removeUserDialog(entry.key, username),
|
||||
icon: Icons.delete_sweep,
|
||||
color: Colors.red,
|
||||
),
|
||||
],
|
||||
child: Container(
|
||||
decoration: BoxDecoration(color: theme.canvasColor),
|
||||
child: ListTile(
|
||||
trailing: username ==
|
||||
accountsStore.defaultUserFor(entry.key).name
|
||||
? Icon(
|
||||
Icons.check_circle_outline,
|
||||
color: theme.accentColor,
|
||||
)
|
||||
: null,
|
||||
title: Text(username),
|
||||
onLongPress: () {
|
||||
accountsStore.setDefaultAccountFor(entry.key, username);
|
||||
},
|
||||
title: Text(username),
|
||||
onLongPress: () {
|
||||
accountsStore.setDefaultAccountFor(
|
||||
entry.key, username);
|
||||
},
|
||||
|
||||
onTap: () {}, // TODO: go to managing account
|
||||
onTap: () {}, // TODO: go to managing account
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
ListTile(
|
||||
leading: Icon(Icons.add),
|
||||
title: Text('Add account'),
|
||||
onTap: () {
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (_) => _AccountsConfigAddAccountDialog(
|
||||
scaffoldKey: _scaffoldKey,
|
||||
instanceUrl: entry.key,
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
if (entry.value.keys.isEmpty)
|
||||
ListTile(
|
||||
leading: Icon(Icons.add),
|
||||
title: Text('Add account'),
|
||||
onTap: () {
|
||||
showCupertinoModalPopup(
|
||||
context: context,
|
||||
builder: (_) =>
|
||||
AddAccountPage(instanceUrl: entry.key));
|
||||
},
|
||||
),
|
||||
]
|
||||
],
|
||||
);
|
||||
|
@ -157,135 +280,6 @@ class AccountsConfigPage extends HookWidget {
|
|||
}
|
||||
}
|
||||
|
||||
class _AccountsConfigAddInstanceDialog extends HookWidget {
|
||||
final GlobalKey<ScaffoldState> scaffoldKey;
|
||||
|
||||
const _AccountsConfigAddInstanceDialog({@required this.scaffoldKey})
|
||||
: assert(scaffoldKey != null);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final instanceController = useTextEditingController();
|
||||
useValueListenable(instanceController);
|
||||
final accountsStore = useAccountsStore();
|
||||
|
||||
final loading = useState(false);
|
||||
|
||||
handleOnAdd() async {
|
||||
try {
|
||||
loading.value = true;
|
||||
await accountsStore.addInstance(instanceController.text);
|
||||
scaffoldKey.currentState.hideCurrentSnackBar();
|
||||
} on Exception catch (err) {
|
||||
scaffoldKey.currentState.showSnackBar(SnackBar(
|
||||
content: Text(err.toString()),
|
||||
));
|
||||
}
|
||||
loading.value = false;
|
||||
Navigator.of(context).pop();
|
||||
}
|
||||
|
||||
return AlertDialog(
|
||||
title: Text('Add instance'),
|
||||
content: TextField(
|
||||
autofocus: true,
|
||||
controller: instanceController,
|
||||
decoration: InputDecoration(
|
||||
border: OutlineInputBorder(),
|
||||
labelText: 'Instance url',
|
||||
),
|
||||
),
|
||||
actions: <Widget>[
|
||||
FlatButton(
|
||||
child: Text('Cancel'),
|
||||
onPressed: () => Navigator.of(context).pop(),
|
||||
),
|
||||
FlatButton(
|
||||
child: !loading.value ? Text('Add') : CircularProgressIndicator(),
|
||||
onPressed: instanceController.text.isEmpty ? null : handleOnAdd,
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _AccountsConfigAddAccountDialog extends HookWidget {
|
||||
final GlobalKey<ScaffoldState> scaffoldKey;
|
||||
final String instanceUrl;
|
||||
|
||||
const _AccountsConfigAddAccountDialog(
|
||||
{@required this.scaffoldKey, @required this.instanceUrl})
|
||||
: assert(scaffoldKey != null),
|
||||
assert(instanceUrl != null);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final usernameController = useTextEditingController();
|
||||
final passwordController = useTextEditingController();
|
||||
useValueListenable(usernameController);
|
||||
useValueListenable(passwordController);
|
||||
final accountsStore = useAccountsStore();
|
||||
|
||||
final loading = useState(false);
|
||||
|
||||
handleOnAdd() async {
|
||||
try {
|
||||
loading.value = true;
|
||||
await accountsStore.addAccount(
|
||||
instanceUrl,
|
||||
usernameController.text,
|
||||
passwordController.text,
|
||||
);
|
||||
} on Exception catch (err) {
|
||||
scaffoldKey.currentState.showSnackBar(SnackBar(
|
||||
content: Text(err.toString()),
|
||||
));
|
||||
}
|
||||
loading.value = false;
|
||||
Navigator.of(context).pop();
|
||||
}
|
||||
|
||||
return AlertDialog(
|
||||
title: Text('Add account'),
|
||||
content: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
TextField(
|
||||
autofocus: true,
|
||||
controller: usernameController,
|
||||
decoration: InputDecoration(
|
||||
border: OutlineInputBorder(),
|
||||
labelText: 'Username or email',
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 5),
|
||||
TextField(
|
||||
controller: passwordController,
|
||||
obscureText: true,
|
||||
decoration: InputDecoration(
|
||||
border: OutlineInputBorder(),
|
||||
labelText: 'Password',
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
actions: <Widget>[
|
||||
FlatButton(
|
||||
child: Text('Cancel'),
|
||||
onPressed: () => Navigator.of(context).pop(),
|
||||
),
|
||||
FlatButton(
|
||||
child: !loading.value ? Text('Add') : CircularProgressIndicator(),
|
||||
onPressed:
|
||||
usernameController.text.isEmpty || passwordController.text.isEmpty
|
||||
? null
|
||||
: handleOnAdd,
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _SectionHeading extends StatelessWidget {
|
||||
final String text;
|
||||
|
||||
|
@ -297,7 +291,7 @@ class _SectionHeading extends StatelessWidget {
|
|||
return Padding(
|
||||
child: Text(text.toUpperCase(),
|
||||
style: theme.textTheme.subtitle2.copyWith(color: theme.accentColor)),
|
||||
padding: EdgeInsets.only(left: 20, top: 40),
|
||||
padding: EdgeInsets.only(left: 20, top: 0),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -10,6 +10,7 @@ class AccountsStore extends _AccountsStore with _$AccountsStore {}
|
|||
|
||||
abstract class _AccountsStore with Store {
|
||||
ReactionDisposer _saveReactionDisposer;
|
||||
ReactionDisposer _pickDefaultsDisposer;
|
||||
|
||||
_AccountsStore() {
|
||||
// persistently save settings each time they are changed
|
||||
|
@ -24,10 +25,67 @@ abstract class _AccountsStore with Store {
|
|||
],
|
||||
(_) => save(),
|
||||
);
|
||||
|
||||
// check if there's a default profile and if not, select one
|
||||
_pickDefaultsDisposer = reaction(
|
||||
(_) => [
|
||||
users.forEach((k, submap) =>
|
||||
MapEntry(k, submap.forEach((k2, v2) => MapEntry(k2, v2)))),
|
||||
tokens.forEach((k, submap) =>
|
||||
MapEntry(k, submap.forEach((k2, v2) => MapEntry(k2, v2)))),
|
||||
],
|
||||
(_) => _assignDefaultAccounts(),
|
||||
);
|
||||
}
|
||||
|
||||
@action
|
||||
void _assignDefaultAccounts() {
|
||||
// remove dangling defaults
|
||||
_defaultAccounts.entries.map((dft) {
|
||||
final instance = dft.key;
|
||||
final username = dft.value;
|
||||
// if instance or username doesn't exist, remove
|
||||
if (!users.containsKey(instance) ||
|
||||
!users[instance].containsKey(username)) {
|
||||
return instance;
|
||||
}
|
||||
}).forEach(_defaultAccounts.remove);
|
||||
if (_defaultAccount != null) {
|
||||
final instance = _defaultAccount.split('@')[1];
|
||||
final username = _defaultAccount.split('@')[0];
|
||||
// if instance or username doesn't exist, remove
|
||||
if (!users.containsKey(instance) ||
|
||||
!users[instance].containsKey(username)) {
|
||||
_defaultAccount = null;
|
||||
}
|
||||
}
|
||||
|
||||
// set local defaults
|
||||
for (final instanceUrl in users.keys) {
|
||||
// if this instance is not in defaults
|
||||
if (!_defaultAccounts.containsKey(instanceUrl)) {
|
||||
// select first account in this instance, if any
|
||||
if (!isAnonymousFor(instanceUrl)) {
|
||||
setDefaultAccountFor(instanceUrl, users[instanceUrl].keys.first);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// set global default
|
||||
if (_defaultAccount == null) {
|
||||
// select first account of first instance
|
||||
for (final instanceUrl in users.keys) {
|
||||
// select first account in this instance, if any
|
||||
if (!isAnonymousFor(instanceUrl)) {
|
||||
setDefaultAccount(instanceUrl, users[instanceUrl].keys.first);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void dispose() {
|
||||
_saveReactionDisposer();
|
||||
_pickDefaultsDisposer();
|
||||
}
|
||||
|
||||
void load() async {
|
||||
|
@ -122,11 +180,13 @@ abstract class _AccountsStore with Store {
|
|||
return tokens[instanceUrl][_defaultAccounts[instanceUrl]];
|
||||
}).value;
|
||||
|
||||
/// sets globally default account
|
||||
@action
|
||||
void setDefaultAccount(String instanceUrl, String username) {
|
||||
_defaultAccount = '$username@$instanceUrl';
|
||||
}
|
||||
|
||||
/// sets default account for given instance
|
||||
@action
|
||||
void setDefaultAccountFor(String instanceUrl, String username) {
|
||||
_defaultAccounts[instanceUrl] = username;
|
||||
|
@ -174,15 +234,6 @@ abstract class _AccountsStore with Store {
|
|||
final userData =
|
||||
await lemmy.getSite(auth: token.raw).then((value) => value.myUser);
|
||||
|
||||
// first account for this instance
|
||||
if (users[instanceUrl].isEmpty) {
|
||||
// first account ever
|
||||
if (hasNoAccount) {
|
||||
setDefaultAccount(instanceUrl, userData.name);
|
||||
}
|
||||
|
||||
setDefaultAccountFor(instanceUrl, userData.name);
|
||||
}
|
||||
users[instanceUrl][userData.name] = userData;
|
||||
tokens[instanceUrl][userData.name] = token;
|
||||
}
|
||||
|
@ -190,21 +241,36 @@ abstract class _AccountsStore with Store {
|
|||
/// adds a new instance with no accounts associated with it.
|
||||
/// Additionally makes a test GET /site request to check if the instance exists
|
||||
@action
|
||||
Future<void> addInstance(String instanceUrl) async {
|
||||
Future<void> addInstance(
|
||||
String instanceUrl, {
|
||||
bool assumeValid = false,
|
||||
}) async {
|
||||
if (users.containsKey(instanceUrl)) {
|
||||
throw Exception('This instance has already been added');
|
||||
}
|
||||
|
||||
try {
|
||||
await LemmyApi(instanceUrl).v1.getSite();
|
||||
// ignore: avoid_catches_without_on_clauses
|
||||
} catch (_) {
|
||||
throw Exception('This instance seems to not exist');
|
||||
if (!assumeValid) {
|
||||
try {
|
||||
await LemmyApi(instanceUrl).v1.getSite();
|
||||
// ignore: avoid_catches_without_on_clauses
|
||||
} catch (_) {
|
||||
throw Exception('This instance seems to not exist');
|
||||
}
|
||||
}
|
||||
|
||||
users[instanceUrl] = ObservableMap();
|
||||
tokens[instanceUrl] = ObservableMap();
|
||||
}
|
||||
|
||||
// TODO: add a way of removing accounts/instances
|
||||
@action
|
||||
void removeInstance(String instanceUrl) {
|
||||
users.remove(instanceUrl);
|
||||
tokens.remove(instanceUrl);
|
||||
}
|
||||
|
||||
@action
|
||||
void removeAccount(String instanceUrl, String username) {
|
||||
users[instanceUrl].remove(username);
|
||||
tokens[instanceUrl].remove(username);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -117,13 +117,25 @@ mixin _$AccountsStore on _AccountsStore, Store {
|
|||
final _$addInstanceAsyncAction = AsyncAction('_AccountsStore.addInstance');
|
||||
|
||||
@override
|
||||
Future<void> addInstance(String instanceUrl) {
|
||||
return _$addInstanceAsyncAction.run(() => super.addInstance(instanceUrl));
|
||||
Future<void> addInstance(String instanceUrl, {bool assumeValid = false}) {
|
||||
return _$addInstanceAsyncAction
|
||||
.run(() => super.addInstance(instanceUrl, assumeValid: assumeValid));
|
||||
}
|
||||
|
||||
final _$_AccountsStoreActionController =
|
||||
ActionController(name: '_AccountsStore');
|
||||
|
||||
@override
|
||||
void _assignDefaultAccounts() {
|
||||
final _$actionInfo = _$_AccountsStoreActionController.startAction(
|
||||
name: '_AccountsStore._assignDefaultAccounts');
|
||||
try {
|
||||
return super._assignDefaultAccounts();
|
||||
} finally {
|
||||
_$_AccountsStoreActionController.endAction(_$actionInfo);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void setDefaultAccount(String instanceUrl, String username) {
|
||||
final _$actionInfo = _$_AccountsStoreActionController.startAction(
|
||||
|
@ -146,6 +158,28 @@ mixin _$AccountsStore on _AccountsStore, Store {
|
|||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void removeInstance(String instanceUrl) {
|
||||
final _$actionInfo = _$_AccountsStoreActionController.startAction(
|
||||
name: '_AccountsStore.removeInstance');
|
||||
try {
|
||||
return super.removeInstance(instanceUrl);
|
||||
} finally {
|
||||
_$_AccountsStoreActionController.endAction(_$actionInfo);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void removeAccount(String instanceUrl, String username) {
|
||||
final _$actionInfo = _$_AccountsStoreActionController.startAction(
|
||||
name: '_AccountsStore.removeAccount');
|
||||
try {
|
||||
return super.removeAccount(instanceUrl, username);
|
||||
} finally {
|
||||
_$_AccountsStoreActionController.endAction(_$actionInfo);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return '''
|
||||
|
|
14
pubspec.lock
14
pubspec.lock
|
@ -265,6 +265,20 @@ packages:
|
|||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.1.0+2"
|
||||
flutter_slidable:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: flutter_slidable
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.5.7"
|
||||
flutter_speed_dial:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: flutter_speed_dial
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.2.5"
|
||||
flutter_test:
|
||||
dependency: "direct dev"
|
||||
description: flutter
|
||||
|
|
|
@ -21,6 +21,8 @@ environment:
|
|||
sdk: '>=2.7.0 <3.0.0'
|
||||
|
||||
dependencies:
|
||||
flutter_speed_dial: ^1.2.5
|
||||
flutter_slidable: ^0.5.7
|
||||
photo_view: ^0.10.2
|
||||
url_launcher: ^5.5.1
|
||||
markdown: ^2.1.8
|
||||
|
|
Loading…
Reference in New Issue