minor bugfixes

thunder-app · Jun 15, 2023 · 5a88a40 · 5a88a40
1 parent f4d914f
commit 5a88a40
Show file tree

Hide file tree

Showing 27 changed files with 375 additions and 270 deletions.
diff --git a/README.md b/README.md
@@ -55,11 +55,17 @@ Your passion, contributions, and ideas would be greatly appreciated! Together, l
 </p>
 <hr />
 
-## Features
 
-Thunder is currently undergoing **active development**, and it is possible that not all features have been fully implemented at this stage.
+## Releases
+**Note:** As this is still in alpha and WIP, releases will happen through GitHub. There are no plans at the moment to release to Google Play store (and derivatives) or Apple's TestFlight. However, this may change in the future as more progress is made.
+
+All releases will be held in the [Releases](https://github.com/hjiangsu/thunder/releases) section under the corresponding version.
+- For iOS users, you can install Thunder using [AltStore](https://altstore.io/)
+- For Android users, simply install Thunder with the provided APK file.
 
-Due to this, significant breaking changes may occur between versions. The next section summarizes the features that are currently implemented.
+## Features
+
+Thunder is currently undergoing **active development**, and it is possible that not all features have been fully implemented at this stage. Due to this, significant breaking changes may occur between versions. The next section summarizes the features that are currently implemented.
 
 #### **Communities**
 
@@ -75,11 +81,11 @@ Due to this, significant breaking changes may occur between versions. The next s
 
 #### **Authentication**
 
-- Singe account login with instance
+- Single account login with instance
 
 #### **Theme & Customization**
 
-- N/A
+- Basic settings
 
 ## Roadmap
 
@@ -98,8 +104,6 @@ Contributions are always welcome! To contribute potential features or bug-fixes:
 
 ## Building From Source
 
-There are a few prerequisites in order to build and run the application locally.
-
 ### Installing Flutter and Related Dependencies
 
 Thunder is developed with Flutter, and is built to support both iOS and Android.

diff --git a/lib/account/bloc/account_bloc.dart b/lib/account/bloc/account_bloc.dart
@@ -48,7 +48,6 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
               posts: getPersonDetailsResponse.posts,
             ));
           } catch (e) {
-            print('re-attempting: $attemptCount');
             attemptCount += 1;
           }
         }

diff --git a/lib/community/bloc/community_bloc.dart b/lib/community/bloc/community_bloc.dart
@@ -96,9 +96,9 @@ class CommunityBloc extends Bloc<CommunityEvent, CommunityState> {
   Future<void> _getCommunityPostsEvent(GetCommunityPostsEvent event, Emitter<CommunityState> emit) async {
     int attemptCount = 0;
 
-    print('event: ${event.communityId} state ${state.communityId}');
-
     try {
+      Stopwatch stopwatch = Stopwatch()..start();
+
       while (attemptCount < 2) {
         try {
           LemmyClient lemmyClient = LemmyClient.instance;
@@ -114,7 +114,7 @@ class CommunityBloc extends Bloc<CommunityEvent, CommunityState> {
               GetPosts(
                 auth: jwt,
                 page: 1,
-                limit: 30,
+                limit: 15,
                 sort: event.sortType ?? SortType.Hot,
                 type_: event.listingType ?? ListingType.Local,
                 communityId: event.communityId,
@@ -125,41 +125,45 @@ class CommunityBloc extends Bloc<CommunityEvent, CommunityState> {
 
             return emit(state.copyWith(
               status: CommunityStatus.success,
-              postViews: posts,
               page: 2,
+              postViews: posts,
               listingType: event.listingType ?? ListingType.Local,
               communityId: event.communityId,
+              hasReachedEnd: posts.isEmpty,
             ));
           } else {
+            if (state.hasReachedEnd) return emit(state.copyWith(status: CommunityStatus.success));
+            emit(state.copyWith(status: CommunityStatus.refreshing));
+
             GetPostsResponse getPostsResponse = await lemmy.getPosts(
               GetPosts(
                 auth: jwt,
                 page: state.page,
-                limit: 30,
+                limit: 15,
                 sort: event.sortType ?? SortType.Hot,
-                type_: state.listingType,
+                type_: state.listingType ?? ListingType.Local,
                 communityId: state.communityId,
               ),
             );
 
             List<PostViewMedia> posts = await parsePostViews(getPostsResponse.posts);
-
             List<PostViewMedia> postViews = List.from(state.postViews ?? []);
             postViews.addAll(posts);
 
             return emit(
               state.copyWith(
                 status: CommunityStatus.success,
-                postViews: postViews,
                 page: state.page + 1,
+                postViews: postViews,
+                hasReachedEnd: posts.isEmpty,
               ),
             );
           }
         } catch (e) {
-          print('re-attempting: $attemptCount');
           attemptCount += 1;
         }
       }
+      print('doSomething() executed in ${stopwatch.elapsed}');
     } on DioException catch (e) {
       emit(state.copyWith(status: CommunityStatus.failure, errorMessage: e.message));
     } catch (e) {

diff --git a/lib/community/bloc/community_state.dart b/lib/community/bloc/community_state.dart
@@ -10,6 +10,7 @@ class CommunityState extends Equatable {
     this.errorMessage,
     this.listingType = ListingType.Local,
     this.communityId,
+    this.hasReachedEnd = false,
   });
 
   final CommunityStatus status;
@@ -23,13 +24,16 @@ class CommunityState extends Equatable {
   // Specifies the community we are loading for
   final int? communityId;
 
+  final bool hasReachedEnd;
+
   CommunityState copyWith({
     CommunityStatus? status,
     int? page,
     List<PostViewMedia>? postViews,
     String? errorMessage,
     ListingType? listingType,
     int? communityId,
+    bool? hasReachedEnd,
   }) {
     return CommunityState(
       status: status ?? this.status,
@@ -38,9 +42,10 @@ class CommunityState extends Equatable {
       errorMessage: errorMessage ?? this.errorMessage,
       listingType: listingType ?? this.listingType,
       communityId: communityId ?? this.communityId,
+      hasReachedEnd: hasReachedEnd ?? this.hasReachedEnd,
     );
   }
 
   @override
-  List<Object?> get props => [status, page, postViews, errorMessage, listingType, communityId];
+  List<Object?> get props => [status, page, postViews, errorMessage, listingType, communityId, hasReachedEnd];
 }
diff --git a/lib/community/pages/community_page.dart b/lib/community/pages/community_page.dart
@@ -5,7 +5,6 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lemmy/lemmy.dart';
 
 import 'package:thunder/community/bloc/community_bloc.dart';
-import 'package:thunder/community/pages/create_post_page.dart';
 import 'package:thunder/community/widgets/community_drawer.dart';
 import 'package:thunder/community/widgets/post_card_list.dart';
 
@@ -52,7 +51,6 @@ const sortTypeItems = [
 
 class CommunityPage extends StatefulWidget {
   final int? communityId;
-
   const CommunityPage({super.key, this.communityId});
 
   @override
@@ -88,7 +86,7 @@ class _CommunityPageState extends State<CommunityPage> {
                     (state.status == CommunityStatus.loading || state.status == CommunityStatus.initial)
                         ? ''
                         : (state.communityId != null)
-                            ? (state.postViews?.first.community.name ?? '')
+                            ? (state.postViews?.firstOrNull?.community.name ?? '')
                             : ((state.listingType != null) ? (destinations.firstWhere((destination) => destination.listingType == state.listingType).label) : ''),
                   ),
                   centerTitle: false,
@@ -162,14 +160,14 @@ class _CommunityPageState extends State<CommunityPage> {
                   ],
                 ),
                 drawer: (widget.communityId != null) ? null : const CommunityDrawer(),
-                floatingActionButton: (state.communityId != null)
-                    ? FloatingActionButton(
-                        onPressed: () {
-                          Navigator.of(context).push(MaterialPageRoute(builder: (context) => CreatePostPage(communityId: state.communityId!)));
-                        },
-                        child: const Icon(Icons.add),
-                      )
-                    : null,
+                // floatingActionButton: (state.communityId != null)
+                //     ? FloatingActionButton(
+                //         onPressed: () {
+                //           Navigator.of(context).push(MaterialPageRoute(builder: (context) => CreatePostPage(communityId: state.communityId!)));
+                //         },
+                //         child: const Icon(Icons.add),
+                //       )
+                //     : null,
                 body: SafeArea(child: _getBody(context, state)),
               );
             },
@@ -191,7 +189,11 @@ class _CommunityPageState extends State<CommunityPage> {
       case CommunityStatus.refreshing:
       case CommunityStatus.networkFailure:
       case CommunityStatus.success:
-        return PostCardList(postViews: state.postViews, communityId: widget.communityId);
+        return PostCardList(
+          postViews: state.postViews,
+          communityId: widget.communityId,
+          hasReachedEnd: state.hasReachedEnd,
+        );
       case CommunityStatus.empty:
       case CommunityStatus.failure:
         return Center(
@@ -216,14 +218,7 @@ class _CommunityPageState extends State<CommunityPage> {
                 const SizedBox(height: 32.0),
                 ElevatedButton(
                   style: ElevatedButton.styleFrom(minimumSize: const Size.fromHeight(50)),
-                  onPressed: () => {
-                    context.read<CommunityBloc>().add(
-                          GetCommunityPostsEvent(
-                            reset: true,
-                            communityId: widget.communityId,
-                          ),
-                        ),
-                  },
+                  onPressed: () => context.read<CommunityBloc>().add(GetCommunityPostsEvent(reset: true, communityId: widget.communityId)),
                   child: const Text('Refresh Content'),
                 ),
               ],

diff --git a/lib/community/pages/create_post_page.dart b/lib/community/pages/create_post_page.dart
@@ -20,7 +20,7 @@ class _CreatePostPageState extends State<CreatePostPage> {
   bool isClearButtonDisabled = false;
   bool isSubmitButtonDisabled = true;
 
-  final List<bool> _selectedPostType = <bool>[true, false, false];
+  // final List<bool> _selectedPostType = <bool>[true, false, false];
 
   String description = '';
   TextEditingController controller = TextEditingController();
@@ -33,8 +33,6 @@ class _CreatePostPageState extends State<CreatePostPage> {
     controller.addListener(() {
       if (controller.text.isEmpty && !isClearButtonDisabled) setState(() => isClearButtonDisabled = true);
       if (controller.text.isNotEmpty && isClearButtonDisabled) setState(() => isClearButtonDisabled = false);
-
-      print(controller.text);
     });
 
     _titleTextController.addListener(() {