Add Stacker Saloon

felipebueno · Jun 9, 2024 · b76436e · b76436e
1 parent 0b4d356
commit b76436e
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 55 deletions.
diff --git a/lib/data/api.dart b/lib/data/api.dart
@@ -118,13 +118,24 @@ final class Api {
   ) async {
     final response = (responseData['pageProps'] ?? responseData);
     final data = response['ssrData'] ?? response['data'];
+
     final itemsMap =
         (data['items'] ?? data['topItems'] ?? data['notifications']);
     final List items = itemsMap['items'] ?? itemsMap['notifications'];
 
+    if (postType == PostType.home) {
+      // TODO: Temporary solution to get Stacker Saloon on the list
+      final List? pins = itemsMap['pins'];
+      if (pins != null && pins.isNotEmpty) {
+        for (var pin in pins) {
+          items.insert(pin['position'], pin);
+        }
+      }
+    }
+
     final cursor = itemsMap['cursor'];
     if (cursor != null) {
-      await SharedPrefsManager.create(
+      await SharedPrefsManager.set(
         '${postType.name}-cursor',
         cursor,
       );
@@ -169,15 +180,15 @@ final class Api {
   }
 
   Future<void> _saveBuildId(String newBuildId) async {
-    await SharedPrefsManager.create('build-id', newBuildId);
+    await SharedPrefsManager.set('build-id', newBuildId);
   }
 
   Future<String?> _getCurrBuildId() async {
-    return await SharedPrefsManager.read('build-id');
+    return await SharedPrefsManager.get('build-id');
   }
 
   Future<List<Post>> fetchMorePosts(PostType postType) async {
-    final cursor = await SharedPrefsManager.read('${postType.name}-cursor');
+    final cursor = await SharedPrefsManager.get('${postType.name}-cursor');
 
     if (cursor == null) {
       throw Exception('Error fetching more');
@@ -249,7 +260,7 @@ final class Api {
       return null;
     }
 
-    await SharedPrefsManager.create(
+    await SharedPrefsManager.set(
       'me',
       jsonEncode(me),
     );
@@ -365,7 +376,7 @@ final class Api {
     if (response.statusCode == 403 &&
         response.realUri.toString() ==
             '$baseUrl/api/auth/error?error=Verification') {
-      final sessionData = await SharedPrefsManager.read('session');
+      final sessionData = await SharedPrefsManager.get('session');
       if (sessionData == null || sessionData == 'null' || sessionData == '{}') {
         _goToLoginFailedPage();
 
@@ -401,7 +412,7 @@ final class Api {
       return null;
     }
 
-    await SharedPrefsManager.create(
+    await SharedPrefsManager.set(
       'session',
       jsonEncode(sessionResponse.data),
     );

diff --git a/lib/data/shared_prefs_manager.dart b/lib/data/shared_prefs_manager.dart
@@ -1,7 +1,7 @@
 import 'package:shared_preferences/shared_preferences.dart';
 
 class SharedPrefsManager {
-  static Future<void> create(String key, dynamic value) async {
+  static Future<void> set(String key, dynamic value) async {
     final prefs = await SharedPreferences.getInstance();
 
     if (value is int) {
@@ -16,12 +16,12 @@ class SharedPrefsManager {
       prefs.setStringList(key, value);
     } else {
       print(
-        'SharedPrefsManager.create error: value => $value for key => $key has unexpected type.',
+        'SharedPrefsManager.set error: value => $value for key => $key has unexpected type.',
       );
     }
   }
 
-  static Future<dynamic> read(String key) async {
+  static Future<dynamic> get(String key) async {
     final prefs = await SharedPreferences.getInstance();
 
     return prefs.get(key);

diff --git a/lib/data/theme_notifier.dart b/lib/data/theme_notifier.dart
@@ -53,7 +53,7 @@ class ThemeNotifier with ChangeNotifier {
   }
 
   ThemeNotifier() {
-    SharedPrefsManager.read('theme-mode').then(
+    SharedPrefsManager.get('theme-mode').then(
       (value) {
         setThemeMode(value);
 
@@ -81,7 +81,7 @@ class ThemeNotifier with ChangeNotifier {
       default:
         _themeData = ThemeMode.dark;
     }
-    SharedPrefsManager.create('theme-mode', themeMode);
+    SharedPrefsManager.set('theme-mode', themeMode);
 
     notifyListeners();
   }

diff --git a/lib/utils.dart b/lib/utils.dart
@@ -84,8 +84,7 @@ class Utils {
     } else if (await canLaunchUrl(uri)) {
       await launchUrl(uri);
     } else {
-      showError(
-          'Could not launch $url. Make sure you have a web browser installed');
+      showError('Could not launch $url');
 
       return;
     }
@@ -100,7 +99,7 @@ class Utils {
       return;
     }
 
-    // TODO: We should check if the modal is open before popping
+    // TODO: We should check if the modal is open before popping it
     if (Navigator.of(ctx).canPop()) {
       Navigator.of(ctx).pop();
     }
@@ -218,7 +217,7 @@ class Utils {
   }
 
   static Future<Session?> getSession() async {
-    final sessionData = await SharedPrefsManager.read('session');
+    final sessionData = await SharedPrefsManager.get('session');
 
     if (sessionData == null || sessionData == 'null' || sessionData == '{}') {
       return null;

diff --git a/lib/views/pages/home_page.dart b/lib/views/pages/home_page.dart
@@ -7,11 +7,11 @@ import 'package:stacker_news/data/models/session.dart';
 import 'package:stacker_news/main.dart';
 import 'package:stacker_news/utils.dart';
 import 'package:stacker_news/views/pages/auth/sign_in_page.dart';
-import 'package:stacker_news/views/pages/new_post/new_post_page.dart';
 import 'package:stacker_news/views/pages/notifications/notifications_page.dart';
 import 'package:stacker_news/views/pages/profile/profile_page.dart';
 import 'package:stacker_news/views/widgets/base_tab.dart';
 import 'package:stacker_news/views/widgets/generic_page_scaffold.dart';
+import 'package:stacker_news/views/widgets/maybe_new_post_button.dart';
 import 'package:stacker_news/views/widgets/sn_logo.dart';
 
 class HomePage extends StatelessWidget {
@@ -141,32 +141,3 @@ class _MaybeNotificationsButtonState extends State<MaybeNotificationsButton> {
     );
   }
 }
-
-class MaybeNewPostFab extends StatefulWidget {
-  const MaybeNewPostFab({super.key});
-
-  @override
-  State<MaybeNewPostFab> createState() => _MaybeNewPostFabState();
-}
-
-class _MaybeNewPostFabState extends State<MaybeNewPostFab> {
-  @override
-  Widget build(BuildContext context) {
-    return FutureBuilder(
-      future: Utils.getSession(),
-      builder: (context, snapshot) {
-        if (snapshot.hasData && snapshot.data is Session) {
-          return FloatingActionButton.extended(
-            onPressed: () {
-              Navigator.pushNamed(context, NewPostPage.id);
-            },
-            icon: const Icon(Icons.add),
-            label: const Text('New Post'),
-          );
-        }
-
-        return Container();
-      },
-    );
-  }
-}
diff --git a/lib/views/widgets/maybe_new_post_button.dart b/lib/views/widgets/maybe_new_post_button.dart
@@ -0,0 +1,33 @@
+import 'package:flutter/material.dart';
+import 'package:stacker_news/data/models/session.dart';
+import 'package:stacker_news/utils.dart';
+import 'package:stacker_news/views/pages/new_post/new_post_page.dart';
+
+class MaybeNewPostFab extends StatefulWidget {
+  const MaybeNewPostFab({super.key});
+
+  @override
+  State<MaybeNewPostFab> createState() => _MaybeNewPostFabState();
+}
+
+class _MaybeNewPostFabState extends State<MaybeNewPostFab> {
+  @override
+  Widget build(BuildContext context) {
+    return FutureBuilder(
+      future: Utils.getSession(),
+      builder: (context, snapshot) {
+        if (snapshot.hasData && snapshot.data is Session) {
+          return FloatingActionButton.extended(
+            onPressed: () {
+              Navigator.pushNamed(context, NewPostPage.id);
+            },
+            icon: const Icon(Icons.add),
+            label: const Text('New Post'),
+          );
+        }
+
+        return Container();
+      },
+    );
+  }
+}
diff --git a/lib/views/widgets/post_item.dart b/lib/views/widgets/post_item.dart
@@ -50,8 +50,9 @@ class _PostItemState extends State<PostItem> {
                 arguments: _post,
               );
             },
-      child: Padding(
+      child: Container(
         padding: const EdgeInsets.symmetric(horizontal: 4.0),
+        color: item.position == null ? null : SNColors.primary.withOpacity(.27),
         child: Row(
           children: [
             if (widget.isCommentsPage && item.id != null && item.id != '')
@@ -127,14 +128,15 @@ class _PostItemState extends State<PostItem> {
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                     children: [
-                      Flexible(
-                        child: Text(
-                          item.isJob == true
-                              ? '${item.company}'
-                              : '${item.sats} sats',
-                          style: label,
+                      if (item.position == null)
+                        Flexible(
+                          child: Text(
+                            item.isJob == true
+                                ? '${item.company}'
+                                : '${item.sats} sats',
+                            style: label,
+                          ),
                         ),
-                      ),
                       Text(
                         item.isJob == true
                             ? '${(item.remote == true && item.location == '') ? 'Remote' : item.location}'

diff --git a/lib/views/widgets/sn_endpoint_version.dart b/lib/views/widgets/sn_endpoint_version.dart
@@ -5,7 +5,7 @@ class SNEndpointVersion extends StatelessWidget {
   const SNEndpointVersion({super.key});
 
   Future<String> _getVersion() async =>
-      await SharedPrefsManager.read('build-id') ?? 'Unknown';
+      await SharedPrefsManager.get('build-id') ?? 'Unknown';
 
   @override
   Widget build(BuildContext context) {