Lemmy
/
lemmur-app-android
mirror of https://github.com/krawieck/lemmur/
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #39 from krawieck/communities-tab

This commit is contained in:
Filip Krawczyk 2020-09-16 01:34:10 +02:00 committed by GitHub
parent 9225d60de6 0352586f97
commit ee097ef386
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 385 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/hooks/delayed_loading.dart Normal file
View File

@ -0,0 +1,43 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'ref.dart';
class DelayedLoading {
final bool pending;
final bool loading;
final void Function() start;
final void Function() cancel;
const DelayedLoading({
@required this.pending,
@required this.loading,
@required this.start,
@required this.cancel,
});
}
/// When loading is [.start()]ed, it goes into a pending state
/// and loading is triggered after [delayDuration].
/// Everything can be reset with [.cancel()]
DelayedLoading useDelayedLoading(Duration delayDuration) {
var loading = useState(false);
var pending = useState(false);
var timerHandle = useRef<Timer>(null);
return DelayedLoading(
loading: loading.value,
pending: pending.value,
start: () {
timerHandle.current = Timer(delayDuration, () => loading.value = true);
pending.value = true;
},
cancel: () {
timerHandle.current?.cancel();
pending.value = false;
loading.value = false;
},
);
}

9
lib/hooks/ref.dart Normal file
View File

@ -0,0 +1,9 @@
import 'package:flutter_hooks/flutter_hooks.dart';
class Ref<T> {
T current;
Ref(this.current);
}
/// see React's useRef
Ref<T> useRef<T>(T initialValue) => useMemoized(() => Ref(initialValue));

288
lib/pages/communities_tab.dart Normal file
View File

@ -0,0 +1,288 @@
import 'dart:async';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:fuzzy/fuzzy.dart';
import 'package:lemmy_api_client/lemmy_api_client.dart';
import 'package:provider/provider.dart';
import '../hooks/delayed_loading.dart';
import '../stores/accounts_store.dart';
import '../util/extensions/iterators.dart';
import '../util/text_color.dart';
class CommunitiesTab extends HookWidget {
CommunitiesTab();
@override
Widget build(BuildContext context) {
var theme = Theme.of(context);
var filterController = useTextEditingController();
useValueListenable(filterController);
var amountOfDisplayInstances = useMemoized(() {
var accountsStore = context.watch<AccountsStore>();
return accountsStore.users.keys
.where((e) => !accountsStore.isAnonymousFor(e))
.length;
});
var isCollapsed = useState(List.filled(amountOfDisplayInstances, false));
// TODO: use useMemoFuture
var instancesFut = useMemoized(() {
var accountsStore = context.watch<AccountsStore>();
var futures = accountsStore.users.keys
.where((e) => !accountsStore.isAnonymousFor(e))
.map(
(instanceUrl) =>
LemmyApi(instanceUrl).v1.getSite().then((e) => e.site),
)
.toList();
return Future.wait(futures);
});
var communitiesFut = useMemoized(() {
var accountsStore = context.watch<AccountsStore>();
var futures = accountsStore.users.keys
.where((e) => !accountsStore.isAnonymousFor(e))
.map(
(instanceUrl) => LemmyApi(instanceUrl)
.v1
.getUserDetails(
sort: SortType.active,
savedOnly: false,
userId: accountsStore.defaultTokenFor(instanceUrl).payload.id,
)
.then((e) => e.follows),
)
.toList();
return Future.wait(futures);
});
var communitiesSnap = useFuture(communitiesFut);
var instancesSnap = useFuture(instancesFut);
if (communitiesSnap.hasError || instancesSnap.hasError) {
return Scaffold(
appBar: AppBar(),
body: Center(
child: Row(
children: [
Icon(Icons.error),
Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
communitiesSnap.error?.toString() ??
instancesSnap.error?.toString(),
),
)
],
),
),
);
} else if (!communitiesSnap.hasData || !instancesSnap.hasData) {
return Scaffold(
appBar: AppBar(),
body: Center(
child: CircularProgressIndicator(),
),
);
}
var instances = instancesSnap.data;
var communities = communitiesSnap.data
..forEach(
(e) => e.sort((a, b) => a.communityName.compareTo(b.communityName)));
var filterIcon = () {
if (filterController.text.isEmpty) {
return Icon(Icons.filter_list);
}
return IconButton(
onPressed: () {
filterController.clear();
primaryFocus.unfocus();
},
icon: Icon(Icons.clear),
);
}();
filterCommunities(List<CommunityFollowerView> comm) {
var matches = Fuzzy(
comm.map((e) => e.communityName).toList(),
options: FuzzyOptions(threshold: 0.5),
).search(filterController.text).map((e) => e.item);
return matches
.map((match) => comm.firstWhere((e) => e.communityName == match));
}
toggleCollapse(int i) => isCollapsed.value =
isCollapsed.value.mapWithIndex((e, j) => j == i ? !e : e).toList();
return Scaffold(
appBar: AppBar(
actions: [
IconButton(
icon: Icon(Icons.style),
onPressed: () {}, // TODO: change styles?
),
],
title: TextField(
controller: filterController,
textAlign: TextAlign.center,
decoration: InputDecoration(
suffixIcon: filterIcon,
isDense: true,
border: OutlineInputBorder(),
hintText: 'Filter', // TODO: hint with an filter icon
),
),
),
body: ListView(
children: [
for (var i in Iterable.generate(amountOfDisplayInstances))
Column(
children: [
ListTile(
onLongPress: () => toggleCollapse(i),
leading: instances[i].icon != null
? CachedNetworkImage(
height: 50,
width: 50,
imageUrl: instances[i].icon,
imageBuilder: (context, imageProvider) => Container(
decoration: BoxDecoration(
shape: BoxShape.circle,
image: DecorationImage(
fit: BoxFit.cover, image: imageProvider),
),
),
errorWidget: (_, __, ___) => SizedBox(width: 50),
)
: SizedBox(width: 50),
title: Text(
instances[i].name,
style: theme.textTheme.headline6,
),
trailing: IconButton(
icon: Icon(isCollapsed.value[i]
? Icons.keyboard_arrow_up
: Icons.keyboard_arrow_down),
onPressed: () => toggleCollapse(i),
),
),
if (!isCollapsed.value[i])
for (var comm in filterCommunities(communities[i]))
Padding(
padding: const EdgeInsets.only(left: 17),
child: ListTile(
dense: true,
leading: VerticalDivider(
color: theme.hintColor,
),
title: Row(
children: [
if (comm.communityIcon != null)
CachedNetworkImage(
height: 30,
width: 30,
imageUrl: comm.communityIcon,
imageBuilder: (context, imageProvider) =>
Container(
decoration: BoxDecoration(
shape: BoxShape.circle,
image: DecorationImage(
fit: BoxFit.cover,
image: imageProvider),
),
),
errorWidget: (_, __, ___) =>
SizedBox(width: 30),
)
else
SizedBox(width: 30),
SizedBox(width: 10),
Text('!${comm.communityName}'),
],
),
trailing: _CommunitySubscribeToggle(
instanceUrl: comm.communityActorId.split('/')[2],
communityId: comm.communityId,
),
),
)
],
),
],
),
);
}
}
class _CommunitySubscribeToggle extends HookWidget {
final int communityId;
final String instanceUrl;
_CommunitySubscribeToggle(
{@required this.instanceUrl, @required this.communityId})
: assert(instanceUrl != null),
assert(communityId != null);
@override
Widget build(BuildContext context) {
var theme = Theme.of(context);
var subbed = useState(true);
var delayed = useDelayedLoading(const Duration(milliseconds: 500));
handleTap() async {
delayed.start();
try {
await LemmyApi(instanceUrl).v1.followCommunity(
communityId: communityId,
follow: !subbed.value,
auth: context
.read<AccountsStore>()
.defaultTokenFor(instanceUrl)
.raw,
);
subbed.value = !subbed.value;
} on Exception catch (err) {
Scaffold.of(context).showSnackBar(SnackBar(
content: Text('Failed to ${subbed.value ? 'un' : ''}follow: $err'),
));
}
delayed.cancel();
}
return InkWell(
onTap: delayed.pending ? () {} : handleTap,
child: Container(
decoration: delayed.loading
? null
: BoxDecoration(
color: subbed.value ? theme.accentColor : null,
border: Border.all(color: theme.accentColor),
borderRadius: BorderRadius.circular(7),
),
child: delayed.loading
? Container(
width: 20, height: 20, child: CircularProgressIndicator())
: Icon(
subbed.value ? Icons.done : Icons.add,
color: subbed.value
? textColorBasedOnBackground(theme.accentColor)
: theme.accentColor,
size: 20,
),
),
);
}
}

32
lib/stores/accounts_store.dart
View File

@ -16,14 +16,14 @@ abstract class _AccountsStore with Store {
_saveReactionDisposer = reaction(
// TODO: does not react to deep changes in users and tokens
(_) => [
users.asObservable(),
tokens.asObservable(),
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)))),
_defaultAccount,
_defaultAccounts.asObservable(),
],
(_) {
save();
},
(_) => save(),
);
}
@ -33,10 +33,26 @@ abstract class _AccountsStore with Store {
void load() async {
var prefs = await SharedPreferences.getInstance();
nestedMapsCast<T>(String key, T f(Map<String, dynamic> json)) =>
ObservableMap.of(
(jsonDecode(prefs.getString(key) ?? '{}') as Map<String, dynamic>)
?.map(
(k, e) => MapEntry(
k,
ObservableMap.of(
(e as Map<String, dynamic>)?.map(
(k, e) => MapEntry(
k, e == null ? null : f(e as Map<String, dynamic>)),
),
),
),
),
);
// set saved settings or create defaults
// TODO: load saved users and tokens
users = ObservableMap();
tokens = ObservableMap();
users = nestedMapsCast('users', (json) => User.fromJson(json));
tokens = nestedMapsCast('tokens', (json) => Jwt(json['raw']));
_defaultAccount = prefs.getString('defaultAccount');
_defaultAccounts = ObservableMap.of(Map.castFrom(
jsonDecode(prefs.getString('defaultAccounts') ?? 'null') ?? {}));

6
lib/util/extensions/iterators.dart Normal file
View File

@ -0,0 +1,6 @@
extension ExtraIterators<E> on Iterable<E> {
Iterable<T> mapWithIndex<T>(T f(E e, int i)) {
var i = 0;
return map((e) => f(e, i++));
}
}

14
pubspec.lock
View File

@ -268,6 +268,13 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
fuzzy:
dependency: "direct main"
description:
name: fuzzy
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.3"
glob:
dependency: transitive
description:
@ -338,6 +345,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.1"
latinize:
dependency: transitive
description:
name: latinize
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.2"
lemmy_api_client:
dependency: "direct main"
description:

1
pubspec.yaml
View File

@ -30,6 +30,7 @@ dependencies:
cached_network_image: ^2.2.0+1
timeago: ^2.0.27
lemmy_api_client: ^0.4.0
fuzzy: <1.0.0
mobx: ^1.2.1
flutter_mobx: ^1.1.0