Remove my feed screen (#209)

daohoangson · web-flow · commit c0829009bc53 · 2023-08-13T22:28:05.000+07:00
diff --git a/lib/config.encrypted.dart b/lib/config.encrypted.dart
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
@@ -299,13 +299,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "myFeed": "My Feed",
-  "@myFeed": {
-    "description": "My feed appbar title",
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "navLowercaseNext": "next",
   "@navLowercaseNext": {
     "type": "text",
diff --git a/lib/l10n/intl_messages.arb b/lib/l10n/intl_messages.arb
@@ -1,5 +1,5 @@
 {
-  "@@last_modified": "2023-08-13T21:27:18.604523",
+  "@@last_modified": "2023-08-13T22:12:24.149517",
   "@@locale": "messages",
   "appTitle": "tinhte.vn Demo",
   "@appTitle": {
@@ -299,13 +299,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "myFeed": "My Feed",
-  "@myFeed": {
-    "description": "My feed appbar title",
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "navLowercaseNext": "next",
   "@navLowercaseNext": {
     "type": "text",
diff --git a/lib/l10n/intl_vi.arb b/lib/l10n/intl_vi.arb
@@ -244,12 +244,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "myFeed": "Cá nhân",
-  "@myFeed": {
-    "description": "My feed appbar title",
-    "type": "text",
-    "placeholders": {}
-  },
   "navLowercaseNext": "tiếp",
   "@navLowercaseNext": {
     "type": "text",
diff --git a/lib/l10n/messages_en.dart b/lib/l10n/messages_en.dart
@@ -95,7 +95,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "menuDeveloperCrashTest" : MessageLookupByLibrary.simpleMessage("Crash Test"),
     "menuDeveloperShowPerformanceOverlay" : MessageLookupByLibrary.simpleMessage("Show Performance Overlay"),
     "menuLogout" : MessageLookupByLibrary.simpleMessage("Logout"),
-    "myFeed" : MessageLookupByLibrary.simpleMessage("My Feed"),
     "navLowercaseNext" : MessageLookupByLibrary.simpleMessage("next"),
     "navLowercasePrevious" : MessageLookupByLibrary.simpleMessage("previous"),
     "navPageX" : m7,
diff --git a/lib/l10n/messages_messages.dart b/lib/l10n/messages_messages.dart
@@ -95,7 +95,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "menuDeveloperCrashTest" : MessageLookupByLibrary.simpleMessage("Crash Test"),
     "menuDeveloperShowPerformanceOverlay" : MessageLookupByLibrary.simpleMessage("Show Performance Overlay"),
     "menuLogout" : MessageLookupByLibrary.simpleMessage("Logout"),
-    "myFeed" : MessageLookupByLibrary.simpleMessage("My Feed"),
     "navLowercaseNext" : MessageLookupByLibrary.simpleMessage("next"),
     "navLowercasePrevious" : MessageLookupByLibrary.simpleMessage("previous"),
     "navPageX" : m7,
diff --git a/lib/l10n/messages_vi.dart b/lib/l10n/messages_vi.dart
@@ -95,7 +95,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "menuDeveloperCrashTest" : MessageLookupByLibrary.simpleMessage("Thử crash app"),
     "menuDeveloperShowPerformanceOverlay" : MessageLookupByLibrary.simpleMessage("Hiển thị đồ thị hiệu năng"),
     "menuLogout" : MessageLookupByLibrary.simpleMessage("Thoát"),
-    "myFeed" : MessageLookupByLibrary.simpleMessage("Cá nhân"),
     "navLowercaseNext" : MessageLookupByLibrary.simpleMessage("tiếp"),
     "navLowercasePrevious" : MessageLookupByLibrary.simpleMessage("trước"),
     "navPageX" : m7,
diff --git a/lib/src/config.dart b/lib/src/config.dart
@@ -30,8 +30,6 @@ abstract class ConfigBase {
   bool get loginWithApple => false;
   bool get loginWithGoogle => false;
 
-  bool get myFeed => false;
-
   bool get threadWidgetShowCoverImageOnly => true;
 }
 
diff --git a/lib/src/intl.dart b/lib/src/intl.dart
@@ -195,9 +195,6 @@ class L10n {
   String get menuLogout =>
       Intl.message('Logout', locale: localeName, name: 'menuLogout');
 
-  String get myFeed => Intl.message('My Feed',
-      desc: 'My feed appbar title', locale: localeName, name: 'myFeed');
-
   String get navLowercaseNext =>
       Intl.message('next', locale: localeName, name: 'navLowercaseNext');
 
diff --git a/lib/src/screens/menu.dart b/lib/src/screens/menu.dart
@@ -3,7 +3,6 @@ import 'package:provider/provider.dart';
 import 'package:the_api/user.dart';
 import 'package:the_app/src/intl.dart';
 import 'package:the_app/src/screens/bookmark_list.dart';
-import 'package:the_app/src/screens/my_feed.dart';
 import 'package:the_app/src/screens/notification_list.dart';
 import 'package:the_app/src/widgets/menu/dark_theme.dart';
 import 'package:the_app/src/widgets/app_bar.dart';
@@ -26,7 +25,6 @@ class MenuScreen extends StatelessWidget {
               const AppBarDrawerHeader(),
               const MenuDarkTheme(),
               _buildBookmarkList(context, user),
-              _buildMyFeed(context, user),
               _buildNotifications(context, user),
               const AppBarDrawerFooter(),
               _buildPrivacyPolicy(context),
@@ -46,15 +44,6 @@ class MenuScreen extends StatelessWidget {
             )
           : const SizedBox.shrink();
 
-  Widget _buildMyFeed(BuildContext context, User user) =>
-      config.myFeed == true && user.userId > 0
-          ? ListTile(
-              title: Text(l(context).myFeed),
-              onTap: () => Navigator.of(context).push(
-                  MaterialPageRoute(builder: (_) => const MyFeedScreen())),
-            )
-          : const SizedBox.shrink();
-
   Widget _buildNotifications(BuildContext context, User user) => user.userId > 0
       ? ListTile(
           title: Text(l(context).notifications),
diff --git a/lib/src/screens/my_feed.dart b/lib/src/screens/my_feed.dart
diff --git a/lib/src/widgets/thread/widget.dart b/lib/src/widgets/thread/widget.dart
@@ -5,13 +5,8 @@ const _kThreadWidgetSpacing = SizedBox(height: _kThreadWidgetPadding);
 
 class ThreadWidget extends StatelessWidget {
   final Thread thread;
-  final UserFeedData? feedData;
 
-  const ThreadWidget(
-    this.thread, {
-    Key? key,
-    this.feedData,
-  }) : super(key: key);
+  const ThreadWidget(this.thread, {Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -58,11 +53,7 @@ class ThreadWidget extends StatelessWidget {
 
     Widget built = _buildCard(context, children);
 
-    final popupMenuButton =
-        buildPopupMenuButtonForThread(context, thread, feedData);
-    if (popupMenuButton != null) {
-      built = _buildPopupMenu(built, popupMenuButton);
-    } else if (thread.threadIsSticky == true) {
+    if (thread.threadIsSticky == true) {
       built = _buildBanner(context, built);
     }
 
@@ -180,14 +171,6 @@ class ThreadWidget extends StatelessWidget {
     );
   }
 
-  Widget _buildPopupMenu(Widget child, PopupMenuButton popupMenuButton) =>
-      Stack(
-        children: <Widget>[
-          child,
-          Align(alignment: Alignment.topRight, child: popupMenuButton)
-        ],
-      );
-
   Widget _buildTextPadding(Widget child) => Padding(
         padding: const EdgeInsets.symmetric(horizontal: _kThreadWidgetPadding),
         child: child,
diff --git a/lib/src/widgets/threads.dart b/lib/src/widgets/threads.dart
@@ -5,7 +5,6 @@ import 'package:share_plus/share_plus.dart';
 import 'package:the_api/node.dart';
 import 'package:the_api/post.dart';
 import 'package:the_api/thread.dart';
-import 'package:the_api/x_user_feed.dart';
 import 'package:the_app/src/screens/forum_view.dart';
 import 'package:the_app/src/screens/node_view.dart';
 import 'package:the_app/src/screens/thread_view.dart';
@@ -17,7 +16,6 @@ import 'package:the_app/src/api.dart';
 import 'package:the_app/src/config.dart';
 import 'package:the_app/src/intl.dart';
 import 'package:the_app/src/link.dart';
-import 'package:the_app/src/widgets/x_user_feed/thread.dart';
 
 part 'thread/navigation.dart';
 part 'thread/widget.dart';
diff --git a/lib/src/widgets/x_user_feed.dart b/lib/src/widgets/x_user_feed.dart
diff --git a/lib/src/widgets/x_user_feed/thread.dart b/lib/src/widgets/x_user_feed/thread.dart
diff --git a/packages/api/lib/search.dart b/packages/api/lib/search.dart
@@ -1,20 +1,17 @@
 import 'thread.dart';
 import 'x_content_list.dart';
-import 'x_user_feed.dart';
 
 class SearchResult<T> {
   final String contentType;
   final int contentId;
 
   final T? content;
-  final UserFeedData? feedData;
   final ContentListItem? listItem;
 
   SearchResult(
     this.contentType,
     this.contentId, {
     this.content,
-    this.feedData,
     this.listItem,
   });
 
@@ -36,9 +33,6 @@ class SearchResult<T> {
       contentType,
       contentId,
       content: content,
-      feedData: json.containsKey('feed_data')
-          ? UserFeedData.fromJson(json['feed_data'])
-          : null,
       listItem: json.containsKey('list_item')
           ? ContentListItem.fromJson(json['list_item'])
           : null,
diff --git a/packages/api/lib/x_user_feed.dart b/packages/api/lib/x_user_feed.dart

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,6 @@ abstract class ConfigBase {`
`30`	`30`	`bool get loginWithApple => false;`
`31`	`31`	`bool get loginWithGoogle => false;`
`32`	`32`
`33`		`- bool get myFeed => false;`
`34`		`-`
`35`	`33`	`bool get threadWidgetShowCoverImageOnly => true;`
`36`	`34`	`}`
`37`	`35`