Skip to content

Add notifications screen #1010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions app/lib/apps/chatbot/chatbot_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import 'package:flutter_inappwebview/flutter_inappwebview.dart';
import 'package:threebotlogin/apps/chatbot/chatbot_config.dart';
import 'package:threebotlogin/browser.dart';
import 'package:threebotlogin/helpers/logger.dart';
import 'package:threebotlogin/widgets/layout_drawer.dart';

class ChatbotWidget extends StatefulWidget {
final String email;
Expand Down Expand Up @@ -85,15 +84,13 @@ class _ChatbotState extends State<ChatbotWidget>
@override
Widget build(BuildContext context) {
super.build(context);
return LayoutDrawer(
titleText: 'Support',
content: Column(
return Column(
children: <Widget>[
Expanded(
child: Container(child: iaWebview),
),
],
));
);
}

@override
Expand Down
7 changes: 2 additions & 5 deletions app/lib/apps/farmers/farmers_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import 'package:threebotlogin/helpers/logger.dart';
import 'package:threebotlogin/models/wallet_data.dart';
import 'package:threebotlogin/screens/scan_screen.dart';
import 'package:threebotlogin/services/shared_preference_service.dart';
import 'package:threebotlogin/widgets/layout_drawer.dart';

bool created = false;

Expand Down Expand Up @@ -153,15 +152,13 @@ class _FarmersState extends State<FarmersWidget>
@override
Widget build(BuildContext context) {
super.build(context);
return LayoutDrawer(
titleText: 'Farming',
content: Column(
return Column(
children: <Widget>[
Expanded(
child: Container(child: iaWebView),
),
],
));
);
}

@override
Expand Down
40 changes: 18 additions & 22 deletions app/lib/apps/news/news_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import 'package:flutter_widget_from_html/flutter_widget_from_html.dart';
import 'package:http/http.dart' as http;
import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
import 'package:threebotlogin/helpers/globals.dart';
import 'package:threebotlogin/widgets/layout_drawer.dart';
import 'package:xml2json/xml2json.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:timeago/timeago.dart' as timeago;
Expand Down Expand Up @@ -60,27 +59,24 @@ class _NewsScreenState extends State<NewsScreen> {

@override
Widget build(BuildContext context) {
return LayoutDrawer(
titleText: 'News',
content: RefreshIndicator(
onRefresh: () async => _pagingController.refresh(),
child: PagedListView<int, Map<String, dynamic>>(
pagingController: _pagingController,
builderDelegate: PagedChildBuilderDelegate<Map<String, dynamic>>(
itemBuilder: (context, entry, index) =>
buildArticleCard(entry, context),
firstPageProgressIndicatorBuilder: (context) => Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const CircularProgressIndicator(),
const SizedBox(height: 8),
Text('Loading Articles...',
style: Theme.of(context).textTheme.bodyLarge!.copyWith(
color: Theme.of(context).colorScheme.onSurface,
fontWeight: FontWeight.bold)),
],
),
return RefreshIndicator(
onRefresh: () async => _pagingController.refresh(),
child: PagedListView<int, Map<String, dynamic>>(
pagingController: _pagingController,
builderDelegate: PagedChildBuilderDelegate<Map<String, dynamic>>(
itemBuilder: (context, entry, index) =>
buildArticleCard(entry, context),
firstPageProgressIndicatorBuilder: (context) => Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const CircularProgressIndicator(),
const SizedBox(height: 8),
Text('Loading Articles...',
style: Theme.of(context).textTheme.bodyLarge!.copyWith(
color: Theme.of(context).colorScheme.onSurface,
fontWeight: FontWeight.bold)),
],
),
),
),
Expand Down
7 changes: 2 additions & 5 deletions app/lib/apps/news/news_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import 'package:threebotlogin/clipboard_hack/clipboard_hack.dart';
import 'package:threebotlogin/events/events.dart';
import 'package:threebotlogin/events/go_home_event.dart';
import 'package:threebotlogin/helpers/logger.dart';
import 'package:threebotlogin/widgets/layout_drawer.dart';
import 'package:url_launcher/url_launcher.dart';

bool created = false;
Expand Down Expand Up @@ -83,15 +82,13 @@ class _NewsState extends State<NewsWidget> with AutomaticKeepAliveClientMixin {
@override
Widget build(BuildContext context) {
super.build(context);
return LayoutDrawer(
titleText: 'News',
content: Column(
return Column(
children: <Widget>[
Expanded(
child: Container(child: iaWebView),
),
],
));
);
}

@override
Expand Down
42 changes: 42 additions & 0 deletions app/lib/apps/notifications/notifications.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import 'package:flutter/material.dart';
import 'package:threebotlogin/app.dart';
import 'package:threebotlogin/apps/farmers/farmers_user_data.dart';
import 'package:threebotlogin/events/events.dart';
import 'package:threebotlogin/events/go_home_event.dart';
import 'package:threebotlogin/screens/notifications_screen.dart';

class Notifications implements App {
static final Notifications _singleton = Notifications._internal();
static const Widget _notificationsWidget = NotificationsScreen();

factory Notifications() {
return _singleton;
}

Notifications._internal();

@override
Future<Widget> widget() async {
return _notificationsWidget;
}

@override
void clearData() {
clearAllData();
}

@override
bool emailVerificationRequired() {
return true;
}

@override
bool pinRequired() {
return true;
}

@override
void back() {
Events().emit(GoHomeEvent());
}
}
8 changes: 8 additions & 0 deletions app/lib/apps/notifications/notifications_user_data.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import 'package:shared_preferences/shared_preferences.dart';


Future<List<String>?> getNotificationSettings() async {
final prefs = await SharedPreferences.getInstance();
var notifications = prefs.getStringList('notifications');
return notifications;
}
17 changes: 7 additions & 10 deletions app/lib/apps/wallet/wallet_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import 'package:threebotlogin/models/wallet_data.dart';
import 'package:threebotlogin/screens/scan_screen.dart';
import 'package:threebotlogin/services/crypto_service.dart';
import 'package:threebotlogin/services/shared_preference_service.dart';
import 'package:threebotlogin/widgets/layout_drawer.dart';

bool created = false;

Expand Down Expand Up @@ -184,15 +183,13 @@ class _WalletState extends State<WalletWidget>
@override
Widget build(BuildContext context) {
super.build(context);
return LayoutDrawer(
titleText: 'Wallet',
content: Column(
children: <Widget>[
Expanded(
child: Container(child: iaWebView),
),
],
));
return Column(
children: <Widget>[
Expanded(
child: Container(child: iaWebView),
),
],
);
}

@override
Expand Down
Loading