diff --git a/lib/screens/news.dart b/lib/screens/news.dart index 41c3acd..8f012ff 100644 --- a/lib/screens/news.dart +++ b/lib/screens/news.dart @@ -14,10 +14,11 @@ class NewsScreenState extends State { int page = 1; List _events = []; - Future> fetchEvents(BuildContext context, int page) async { - List data = await SettingsProvider.of(context).getWithCredentials( - '/users/pd4d10/received_events/public?page=$page', - ); + Future> fetchEvents(int page) async { + var settings = SettingsProvider.of(context); + var login = settings.activeLogin; + List data = await settings + .getWithCredentials('/users/$login/received_events?page=$page'); return data.map((item) => Event.fromJSON(item)).toList(); } @@ -29,14 +30,14 @@ class NewsScreenState extends State { itemBuilder: (context, index) => EventItem(_events[index]), onRefresh: () async { page = 1; - var items = await fetchEvents(context, page); + var items = await fetchEvents(page); setState(() { _events = items; }); }, onLoadMore: () async { page = page + 1; - var items = await fetchEvents(context, page); + var items = await fetchEvents(page); setState(() { _events.addAll(items); }); diff --git a/lib/screens/profile.dart b/lib/screens/profile.dart index c610459..b982800 100644 --- a/lib/screens/profile.dart +++ b/lib/screens/profile.dart @@ -1,10 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; +import '../providers/settings.dart'; import '../screens/user.dart'; class ProfileScreen extends StatelessWidget { @override Widget build(BuildContext context) { - return UserScreen('pd4d10'); + return UserScreen(SettingsProvider.of(context).activeLogin); } }